From 186379adac60048264d75c98f42da4b8c7d02fe2 Mon Sep 17 00:00:00 2001 From: Bianca Nenciu Date: Wed, 17 Nov 2021 18:59:44 +0200 Subject: [PATCH 001/168] FIX: Cache all watched words (#14992) It used to cache up to 1000 words, but the maximum number of watched word is 2000. --- app/services/word_watcher.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/services/word_watcher.rb b/app/services/word_watcher.rb index 1927ac9474..91d795a9d9 100644 --- a/app/services/word_watcher.rb +++ b/app/services/word_watcher.rb @@ -8,7 +8,10 @@ class WordWatcher end def self.words_for_action(action) - words = WatchedWord.where(action: WatchedWord.actions[action.to_sym]).limit(1000) + words = WatchedWord + .where(action: WatchedWord.actions[action.to_sym]) + .limit(WatchedWord::MAX_WORDS_PER_ACTION) + if WatchedWord.has_replacement?(action.to_sym) words.pluck(:word, :replacement).to_h else From 05423e9dfd77a05c7d9062aa7a5aeba8756d01f0 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 17 Nov 2021 20:52:22 +0100 Subject: [PATCH 002/168] DEV: `I18n` global is no longer supported (#14993) Don't allow it when linting. --- lib/tasks/docker.rake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake index 1e712e53b9..30f8675e9c 100644 --- a/lib/tasks/docker.rake +++ b/lib/tasks/docker.rake @@ -70,7 +70,7 @@ task 'docker:test' do if ENV["SINGLE_PLUGIN"] @good &&= run_or_fail("bundle exec rubocop --parallel plugins/#{ENV["SINGLE_PLUGIN"]}") @good &&= run_or_fail("bundle exec ruby script/i18n_lint.rb plugins/#{ENV["SINGLE_PLUGIN"]}/config/locales/{client,server}.en.yml") - @good &&= run_or_fail("yarn eslint --global I18n --ext .js,.js.es6 --no-error-on-unmatched-pattern plugins/#{ENV['SINGLE_PLUGIN']}") + @good &&= run_or_fail("yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern plugins/#{ENV['SINGLE_PLUGIN']}") puts "Listing prettier offenses in #{ENV['SINGLE_PLUGIN']}:" @good &&= run_or_fail_prettier("plugins/#{ENV['SINGLE_PLUGIN']}/**/*.scss", "plugins/#{ENV['SINGLE_PLUGIN']}/**/*.{js,es6}") @@ -78,9 +78,7 @@ task 'docker:test' do @good &&= run_or_fail("bundle exec rake plugin:update_all") unless ENV["SKIP_PLUGINS"] @good &&= run_or_fail("bundle exec rubocop --parallel") unless ENV["SKIP_CORE"] @good &&= run_or_fail("yarn eslint app/assets/javascripts") unless ENV["SKIP_CORE"] - - # TODO: remove --global I18n once plugins can be updated - @good &&= run_or_fail("yarn eslint --global I18n --ext .js,.js.es6 --no-error-on-unmatched-pattern plugins") unless ENV["SKIP_PLUGINS"] + @good &&= run_or_fail("yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern plugins") unless ENV["SKIP_PLUGINS"] @good &&= run_or_fail('bundle exec ruby script/i18n_lint.rb "config/locales/{client,server}.en.yml"') unless ENV["SKIP_CORE"] @good &&= run_or_fail('bundle exec ruby script/i18n_lint.rb "plugins/**/locales/{client,server}.en.yml"') unless ENV["SKIP_PLUGINS"] From 9be69b603c049014e40e341fbddfb8c73344c703 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 17 Nov 2021 20:56:06 +0100 Subject: [PATCH 003/168] DEV: Make `screen-track` a regular service (#14983) --- app/assets/javascripts/application.js | 1 - .../inject-discourse-objects.js | 15 ++------- .../app/{lib => services}/screen-track.js | 32 +++++++++++-------- .../tests/unit/controllers/topic-test.js | 3 +- .../{lib => services}/screen-track-test.js | 8 ++--- 5 files changed, 25 insertions(+), 34 deletions(-) rename app/assets/javascripts/discourse/app/{lib => services}/screen-track.js (95%) rename app/assets/javascripts/discourse/tests/unit/{lib => services}/screen-track-test.js (68%) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 6ddaadf6db..dbaf4acf87 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -74,7 +74,6 @@ //= require ./discourse/app/lib/link-mentions //= require ./discourse/app/components/site-header //= require ./discourse/app/components/d-editor -//= require ./discourse/app/lib/screen-track //= require ./discourse/app/routes/discourse //= require ./discourse/app/routes/build-topic-route //= require ./discourse/app/routes/restricted-user diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js index 576fbc589e..5fa2e380ba 100644 --- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js +++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js @@ -5,7 +5,6 @@ import PrivateMessageTopicTrackingState from "discourse/models/private-message-t import DiscourseLocation from "discourse/lib/discourse-location"; import KeyValueStore from "discourse/lib/key-value-store"; import MessageBus from "message-bus-client"; -import ScreenTrack from "discourse/lib/screen-track"; import SearchService from "discourse/services/search"; import Session from "discourse/models/session"; import Site from "discourse/models/site"; @@ -69,16 +68,6 @@ export default { const session = Session.current(); app.register("session:main", session, { instantiate: false }); - // TODO: Automatically register this service - const screenTrack = new ScreenTrack( - topicTrackingState, - siteSettings, - session, - currentUser, - container.lookup("service:app-events") - ); - app.register("service:screen-track", screenTrack, { instantiate: false }); - app.register("location:discourse-location", DiscourseLocation); const keyValueStore = new KeyValueStore("discourse_"); @@ -87,7 +76,6 @@ export default { ALL_TARGETS.forEach((t) => { app.inject(t, "appEvents", "service:app-events"); - app.inject(t, "topicTrackingState", "topic-tracking-state:main"); app.inject(t, "pmTopicTrackingState", "pm-topic-tracking-state:main"); app.inject(t, "store", "service:store"); app.inject(t, "site", "site:main"); @@ -99,10 +87,11 @@ export default { app.inject(t, "session", "session:main"); app.inject(t, "messageBus", "message-bus:main"); app.inject(t, "siteSettings", "site-settings:main"); + app.inject(t, "topicTrackingState", "topic-tracking-state:main"); }); if (currentUser) { - ["component", "route", "controller", "service"].forEach((t) => { + ["controller", "component", "route", "service"].forEach((t) => { app.inject(t, "currentUser", "current-user:main"); }); } diff --git a/app/assets/javascripts/discourse/app/lib/screen-track.js b/app/assets/javascripts/discourse/app/services/screen-track.js similarity index 95% rename from app/assets/javascripts/discourse/app/lib/screen-track.js rename to app/assets/javascripts/discourse/app/services/screen-track.js index 5988a33300..647c3995f2 100644 --- a/app/assets/javascripts/discourse/app/lib/screen-track.js +++ b/app/assets/javascripts/discourse/app/services/screen-track.js @@ -1,3 +1,4 @@ +import Service, { inject as service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { bind } from "discourse-common/utils/decorators"; import { isTesting } from "discourse-common/config/environment"; @@ -10,21 +11,24 @@ const ANON_MAX_TOPIC_IDS = 5; const AJAX_FAILURE_DELAYS = [5000, 10000, 20000, 40000]; const ALLOWED_AJAX_FAILURES = [405, 429, 500, 501, 502, 503, 504]; -export default class { - constructor( - topicTrackingState, - siteSettings, - session, - currentUser, - appEvents - ) { - this.topicTrackingState = topicTrackingState; - this.siteSettings = siteSettings; - this.session = session; - this.currentUser = currentUser; - this.appEvents = appEvents; +export default class ScreenTrack extends Service { + @service appEvents; + + _consolidatedTimings = []; + _lastTick = null; + _lastScrolled = null; + _lastFlush = 0; + _timings = {}; + _totalTimings = {}; + _topicTime = 0; + _onscreen = []; + _readOnscreen = []; + _readPosts = {}; + _inProgress = false; + + constructor() { + super(...arguments); this.reset(); - this._consolidatedTimings = []; } start(topicId, topicController) { diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js index 7da6519769..bd8badbf58 100644 --- a/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js +++ b/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js @@ -17,11 +17,10 @@ function topicWithStream(streamDetails) { discourseModule("Unit | Controller | topic", function (hooks) { hooks.beforeEach(function () { - this.registry.register("service:screen-track", {}, { instantiate: false }); this.registry.injection("controller", "appEvents", "service:app-events"); }); + hooks.afterEach(function () { - this.registry.unregister("service:screen-track"); this.registry.unregister("current-user:main"); let topic = this.container.lookup("controller:topic"); topic.setProperties({ diff --git a/app/assets/javascripts/discourse/tests/unit/lib/screen-track-test.js b/app/assets/javascripts/discourse/tests/unit/services/screen-track-test.js similarity index 68% rename from app/assets/javascripts/discourse/tests/unit/lib/screen-track-test.js rename to app/assets/javascripts/discourse/tests/unit/services/screen-track-test.js index b1a557811d..7eeceb4b26 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/screen-track-test.js +++ b/app/assets/javascripts/discourse/tests/unit/services/screen-track-test.js @@ -1,9 +1,9 @@ -import { module, test } from "qunit"; -import ScreenTrack from "discourse/lib/screen-track"; +import { discourseModule } from "discourse/tests/helpers/qunit-helpers"; +import { test } from "qunit"; -module("Unit | Utility | screen-track", function () { +discourseModule("Unit | Service | screen-track", function () { test("consolidateTimings", function (assert) { - const tracker = new ScreenTrack(); + const tracker = this.container.lookup("service:screen-track"); tracker.consolidateTimings({ 1: 10, 2: 5 }, 10, 1); tracker.consolidateTimings({ 1: 5, 3: 1 }, 3, 1); From b86127ad123ce4eede7bc861134f32d9312128d2 Mon Sep 17 00:00:00 2001 From: Osama Sayegh Date: Wed, 17 Nov 2021 23:27:30 +0300 Subject: [PATCH 004/168] FEATURE: Apply rate limits per user instead of IP for trusted users (#14706) Currently, Discourse rate limits all incoming requests by the IP address they originate from regardless of the user making the request. This can be frustrating if there are multiple users using Discourse simultaneously while sharing the same IP address (e.g. employees in an office). This commit implements a new feature to make Discourse apply rate limits by user id rather than IP address for users at or higher than the configured trust level (1 is the default). For example, let's say a Discourse instance is configured to allow 200 requests per minute per IP address, and we have 10 users at trust level 4 using Discourse simultaneously from the same IP address. Before this feature, the 10 users could only make a total of 200 requests per minute before they got rate limited. But with the new feature, each user is allowed to make 200 requests per minute because the rate limits are applied on user id rather than the IP address. The minimum trust level for applying user-id-based rate limits can be configured by the `skip_per_ip_rate_limit_trust_level` global setting. The default is 1, but it can be changed by either adding the `DISCOURSE_SKIP_PER_IP_RATE_LIMIT_TRUST_LEVEL` environment variable with the desired value to your `app.yml`, or changing the setting's value in the `discourse.conf` file. Requests made with API keys are still rate limited by IP address and the relevant global settings that control API keys rate limits. Before this commit, Discourse's auth cookie (`_t`) was simply a 32 characters string that Discourse used to lookup the current user from the database and the cookie contained no additional information about the user. However, we had to change the cookie content in this commit so we could identify the user from the cookie without making a database query before the rate limits logic and avoid introducing a bottleneck on busy sites. Besides the 32 characters auth token, the cookie now includes the user id, trust level and the cookie's generation date, and we encrypt/sign the cookie to prevent tampering. Internal ticket number: t54739. --- app/controllers/application_controller.rb | 10 +- app/models/user_api_key.rb | 18 ++ app/models/user_auth_token.rb | 3 +- config/discourse_defaults.conf | 3 + lib/admin_constraint.rb | 6 +- lib/auth/current_user_provider.rb | 6 +- lib/auth/default_current_user_provider.rb | 232 ++++++++++------- lib/guardian.rb | 11 +- lib/homepage_constraint.rb | 4 +- lib/middleware/anonymous_cache.rb | 4 +- lib/middleware/request_tracker.rb | 234 ++++++++++-------- lib/rate_limiter.rb | 9 +- lib/rate_limiter/limit_exceeded.rb | 5 +- lib/staff_constraint.rb | 6 +- .../default_current_user_provider_spec.rb | 188 ++++++++++---- spec/components/current_user_spec.rb | 11 +- spec/components/guardian_spec.rb | 19 +- spec/components/hijack_spec.rb | 2 +- .../middleware/anonymous_cache_spec.rb | 27 +- .../middleware/request_tracker_spec.rb | 188 +++++++++++++- spec/jobs/export_user_archive_spec.rb | 12 +- spec/multisite/request_tracker_spec.rb | 142 +++++++++++ spec/rails_helper.rb | 38 +++ spec/requests/application_controller_spec.rb | 63 +++++ spec/requests/session_controller_spec.rb | 9 +- spec/requests/users_controller_spec.rb | 13 +- spec/support/helpers.rb | 3 +- 27 files changed, 973 insertions(+), 293 deletions(-) create mode 100644 spec/multisite/request_tracker_spec.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index be5fd3b01f..0561be4c82 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -188,13 +188,21 @@ class ApplicationController < ActionController::Base rescue_from RateLimiter::LimitExceeded do |e| retry_time_in_seconds = e&.available_in + response_headers = { + 'Retry-After': retry_time_in_seconds.to_s + } + + if e&.error_code + response_headers['Discourse-Rate-Limit-Error-Code'] = e.error_code + end + with_resolved_locale do render_json_error( e.description, type: :rate_limit, status: 429, extras: { wait_seconds: retry_time_in_seconds }, - headers: { 'Retry-After': retry_time_in_seconds.to_s } + headers: response_headers ) end end diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb index 1c708846b1..d0238781bc 100644 --- a/app/models/user_api_key.rb +++ b/app/models/user_api_key.rb @@ -31,6 +31,24 @@ class UserApiKey < ActiveRecord::Base @key.present? end + def ensure_allowed!(env) + raise Discourse::InvalidAccess.new if !allow?(env) + end + + def update_last_used(client_id) + update_args = { last_used_at: Time.zone.now } + if client_id.present? && client_id != self.client_id + # invalidate old dupe api key for client if needed + UserApiKey + .where(client_id: client_id, user_id: self.user_id) + .where('id <> ?', self.id) + .destroy_all + + update_args[:client_id] = client_id + end + self.update_columns(**update_args) + end + # Scopes allowed to be requested by external services def self.allowed_scopes Set.new(SiteSetting.allow_user_api_key_scopes.split("|")) diff --git a/app/models/user_auth_token.rb b/app/models/user_auth_token.rb index 5cb107cf7a..6566371b20 100644 --- a/app/models/user_auth_token.rb +++ b/app/models/user_auth_token.rb @@ -4,7 +4,8 @@ require 'digest/sha1' class UserAuthToken < ActiveRecord::Base belongs_to :user - ROTATE_TIME = 10.minutes + ROTATE_TIME_MINS = 10 + ROTATE_TIME = ROTATE_TIME_MINS.minutes # used when token did not arrive at client URGENT_ROTATE_TIME = 1.minute diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf index f0d34270d0..293ff29393 100644 --- a/config/discourse_defaults.conf +++ b/config/discourse_defaults.conf @@ -239,6 +239,9 @@ max_reqs_per_ip_mode = block # bypass rate limiting any IP resolved as a private IP max_reqs_rate_limit_on_private = false +# use per user rate limits vs ip rate limits for users with this trust level or more. +skip_per_ip_rate_limit_trust_level = 1 + # logged in DoS protection # protection will only trigger for requests that queue longer than this amount diff --git a/lib/admin_constraint.rb b/lib/admin_constraint.rb index 2fd16b90b3..7146eedfee 100644 --- a/lib/admin_constraint.rb +++ b/lib/admin_constraint.rb @@ -8,10 +8,8 @@ class AdminConstraint def matches?(request) return false if @require_master && RailsMultisite::ConnectionManagement.current_db != "default" - provider = Discourse.current_user_provider.new(request.env) - provider.current_user && - provider.current_user.admin? && - custom_admin_check(request) + current_user = CurrentUser.lookup_from_env(request.env) + current_user&.admin? && custom_admin_check(request) rescue Discourse::InvalidAccess, Discourse::ReadOnly false end diff --git a/lib/auth/current_user_provider.rb b/lib/auth/current_user_provider.rb index 479a44d57d..31880b6dc6 100644 --- a/lib/auth/current_user_provider.rb +++ b/lib/auth/current_user_provider.rb @@ -14,12 +14,12 @@ class Auth::CurrentUserProvider end # log on a user and set cookies and session etc. - def log_on_user(user, session, cookies, opts = {}) + def log_on_user(user, session, cookie_jar, opts = {}) raise NotImplementedError end # optional interface to be called to refresh cookies etc if needed - def refresh_session(user, session, cookies) + def refresh_session(user, session, cookie_jar) end # api has special rights return true if api was detected @@ -37,7 +37,7 @@ class Auth::CurrentUserProvider raise NotImplementedError end - def log_off_user(session, cookies) + def log_off_user(session, cookie_jar) raise NotImplementedError end end diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb index a35d40adda..4f369d9240 100644 --- a/lib/auth/default_current_user_provider.rb +++ b/lib/auth/default_current_user_provider.rb @@ -1,6 +1,27 @@ # frozen_string_literal: true require_relative '../route_matcher' +# You may have seen references to v0 and v1 of our auth cookie in the codebase +# and you're not sure how they differ, so here is an explanation: +# +# From the very early days of Discourse, the auth cookie (_t) consisted only of +# a 32 characters random string that Discourse used to identify/lookup the +# current user. We didn't include any metadata with the cookie or encrypt/sign +# it. +# +# That was v0 of the auth cookie until Nov 2021 when we merged a change that +# required us to store additional metadata with the cookie so we could get more +# information about current user early in the request lifecycle before we +# performed database lookup. We also started encrypting and signing the cookie +# to prevent tampering and obfuscate user information that we include in the +# cookie. This is v1 of our auth cookie and we still use it to this date. +# +# We still accept v0 of the auth cookie to keep users logged in, but upon +# cookie rotation (which happen every 10 minutes) they'll be switched over to +# the v1 format. +# +# We'll drop support for v0 after Discourse 2.9 is released. + class Auth::DefaultCurrentUserProvider CURRENT_USER_KEY ||= "_DISCOURSE_CURRENT_USER" @@ -19,6 +40,9 @@ class Auth::DefaultCurrentUserProvider PATH_INFO ||= "PATH_INFO" COOKIE_ATTEMPTS_PER_MIN ||= 10 BAD_TOKEN ||= "_DISCOURSE_BAD_TOKEN" + DECRYPTED_AUTH_COOKIE = "_DISCOURSE_DECRYPTED_AUTH_COOKIE" + + TOKEN_SIZE = 32 PARAMETER_API_PATTERNS ||= [ RouteMatcher.new( @@ -52,6 +76,25 @@ class Auth::DefaultCurrentUserProvider ), ] + def self.find_v0_auth_cookie(request) + cookie = request.cookies[TOKEN_COOKIE].presence + if cookie && cookie.size == TOKEN_SIZE + cookie + end + end + + def self.find_v1_auth_cookie(env) + return env[DECRYPTED_AUTH_COOKIE] if env.key?(DECRYPTED_AUTH_COOKIE) + + env[DECRYPTED_AUTH_COOKIE] = begin + request = ActionDispatch::Request.new(env) + # don't even initialize a cookie jar if we don't have a cookie at all + if request.cookies[TOKEN_COOKIE].present? + request.cookie_jar.encrypted[TOKEN_COOKIE] + end + end + end + # do all current user initialization here def initialize(env) @env = env @@ -86,11 +129,10 @@ class Auth::DefaultCurrentUserProvider api_key ||= request[API_KEY] end - auth_token = request.cookies[TOKEN_COOKIE] unless user_api_key || api_key - + auth_token = find_auth_token current_user = nil - if auth_token && auth_token.length == 32 + if auth_token limiter = RateLimiter.new(nil, "cookie_auth_#{request.ip}", COOKIE_ATTEMPTS_PER_MIN , 60) if limiter.can_perform? @@ -128,33 +170,42 @@ class Auth::DefaultCurrentUserProvider # possible we have an api call, impersonate if api_key current_user = lookup_api_user(api_key, request) - raise Discourse::InvalidAccess.new(I18n.t('invalid_api_credentials'), nil, custom_message: "invalid_api_credentials") unless current_user + if !current_user + raise Discourse::InvalidAccess.new( + I18n.t('invalid_api_credentials'), + nil, + custom_message: "invalid_api_credentials" + ) + end raise Discourse::InvalidAccess if current_user.suspended? || !current_user.active + admin_api_key_limiter.performed! if !Rails.env.profile? @env[API_KEY_ENV] = true - rate_limit_admin_api_requests! end # user api key handling if user_api_key + @hashed_user_api_key = ApiKey.hash_key(user_api_key) - hashed_user_api_key = ApiKey.hash_key(user_api_key) - limiter_min = RateLimiter.new(nil, "user_api_min_#{hashed_user_api_key}", GlobalSetting.max_user_api_reqs_per_minute, 60) - limiter_day = RateLimiter.new(nil, "user_api_day_#{hashed_user_api_key}", GlobalSetting.max_user_api_reqs_per_day, 86400) + user_api_key_obj = UserApiKey + .active + .joins(:user) + .where(key_hash: @hashed_user_api_key) + .includes(:user, :scopes) + .first - unless limiter_day.can_perform? - limiter_day.performed! - end + raise Discourse::InvalidAccess unless user_api_key_obj - unless limiter_min.can_perform? - limiter_min.performed! - end + user_api_key_limiter_60_secs.performed! + user_api_key_limiter_1_day.performed! - current_user = lookup_user_api_user_and_update_key(user_api_key, @env[USER_API_CLIENT_ID]) - raise Discourse::InvalidAccess unless current_user + user_api_key_obj.ensure_allowed!(@env) + + current_user = user_api_key_obj.user raise Discourse::InvalidAccess if current_user.suspended? || !current_user.active - limiter_min.performed! - limiter_day.performed! + if can_write? + user_api_key_obj.update_last_used(@env[USER_API_CLIENT_ID]) + end @env[USER_API_KEY_ENV] = true end @@ -178,7 +229,7 @@ class Auth::DefaultCurrentUserProvider @env[CURRENT_USER_KEY] = current_user end - def refresh_session(user, session, cookies) + def refresh_session(user, session, cookie_jar) # if user was not loaded, no point refreshing session # it could be an anonymous path, this would add cost return if is_api? || !@env.key?(CURRENT_USER_KEY) @@ -192,18 +243,18 @@ class Auth::DefaultCurrentUserProvider if @user_token.rotate!(user_agent: @env['HTTP_USER_AGENT'], client_ip: @request.ip, path: @env['REQUEST_PATH']) - cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token) + set_auth_cookie!(@user_token.unhashed_auth_token, user, cookie_jar) DiscourseEvent.trigger(:user_session_refreshed, user) end end end - if !user && cookies.key?(TOKEN_COOKIE) - cookies.delete(TOKEN_COOKIE) + if !user && cookie_jar.key?(TOKEN_COOKIE) + cookie_jar.delete(TOKEN_COOKIE) end end - def log_on_user(user, session, cookies, opts = {}) + def log_on_user(user, session, cookie_jar, opts = {}) @user_token = UserAuthToken.generate!( user_id: user.id, user_agent: @env['HTTP_USER_AGENT'], @@ -212,7 +263,7 @@ class Auth::DefaultCurrentUserProvider staff: user.staff?, impersonate: opts[:impersonate]) - cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token) + set_auth_cookie!(@user_token.unhashed_auth_token, user, cookie_jar) user.unstage! make_developer_admin(user) enable_bootstrap_mode(user) @@ -222,22 +273,29 @@ class Auth::DefaultCurrentUserProvider @env[CURRENT_USER_KEY] = user end - def cookie_hash(unhashed_auth_token) - hash = { - value: unhashed_auth_token, - httponly: true, - secure: SiteSetting.force_https + def set_auth_cookie!(unhashed_auth_token, user, cookie_jar) + data = { + token: unhashed_auth_token, + user_id: user.id, + trust_level: user.trust_level, + issued_at: Time.zone.now.to_i } if SiteSetting.persistent_sessions - hash[:expires] = SiteSetting.maximum_session_age.hours.from_now + expires = SiteSetting.maximum_session_age.hours.from_now end if SiteSetting.same_site_cookies != "Disabled" - hash[:same_site] = SiteSetting.same_site_cookies + same_site = SiteSetting.same_site_cookies end - hash + cookie_jar.encrypted[TOKEN_COOKIE] = { + value: data, + httponly: true, + secure: SiteSetting.force_https, + expires: expires, + same_site: same_site + } end def make_developer_admin(user) @@ -258,7 +316,7 @@ class Auth::DefaultCurrentUserProvider end end - def log_off_user(session, cookies) + def log_off_user(session, cookie_jar) user = current_user if SiteSetting.log_out_strict && user @@ -266,7 +324,7 @@ class Auth::DefaultCurrentUserProvider if user.admin && defined?(Rack::MiniProfiler) # clear the profiling cookie to keep stuff tidy - cookies.delete("__profilin") + cookie_jar.delete("__profilin") end user.logged_out @@ -274,8 +332,8 @@ class Auth::DefaultCurrentUserProvider @user_token.destroy end - cookies.delete('authentication_data') - cookies.delete(TOKEN_COOKIE) + cookie_jar.delete('authentication_data') + cookie_jar.delete(TOKEN_COOKIE) end # api has special rights return true if api was detected @@ -290,14 +348,13 @@ class Auth::DefaultCurrentUserProvider end def has_auth_cookie? - cookie = @request.cookies[TOKEN_COOKIE] - !cookie.nil? && cookie.length == 32 + find_auth_token.present? end def should_update_last_seen? return false unless can_write? - api = !!(@env[API_KEY_ENV]) || !!(@env[USER_API_KEY_ENV]) + api = !!@env[API_KEY_ENV] || !!@env[USER_API_KEY_ENV] if @request.xhr? || api @env["HTTP_DISCOURSE_PRESENT"] == "true" @@ -308,31 +365,6 @@ class Auth::DefaultCurrentUserProvider protected - def lookup_user_api_user_and_update_key(user_api_key, client_id) - if api_key = UserApiKey.active.with_key(user_api_key).includes(:user, :scopes).first - unless api_key.allow?(@env) - raise Discourse::InvalidAccess - end - - if can_write? - api_key.update_columns(last_used_at: Time.zone.now) - - if client_id.present? && client_id != api_key.client_id - - # invalidate old dupe api key for client if needed - UserApiKey - .where(client_id: client_id, user_id: api_key.user_id) - .where('id <> ?', api_key.id) - .destroy_all - - api_key.update_columns(client_id: client_id) - end - end - - api_key.user - end - end - def lookup_api_user(api_key_value, request) if api_key = ApiKey.active.with_key(api_key_value).includes(:user).first api_username = header_api_key? ? @env[HEADER_API_USERNAME] : request[API_USERNAME] @@ -378,27 +410,61 @@ class Auth::DefaultCurrentUserProvider !!@env[HEADER_API_KEY] end - def rate_limit_admin_api_requests! - return if Rails.env == "profile" - - limit = GlobalSetting.max_admin_api_reqs_per_minute.to_i - if GlobalSetting.respond_to?(:max_admin_api_reqs_per_key_per_minute) - Discourse.deprecate("DISCOURSE_MAX_ADMIN_API_REQS_PER_KEY_PER_MINUTE is deprecated. Please use DISCOURSE_MAX_ADMIN_API_REQS_PER_MINUTE", drop_from: '2.9.0') - limit = [ GlobalSetting.max_admin_api_reqs_per_key_per_minute.to_i, limit].max - end - - global_limit = RateLimiter.new( - nil, - "admin_api_min", - limit, - 60 - ) - - global_limit.performed! - end - def can_write? @can_write ||= !Discourse.pg_readonly_mode? end + def admin_api_key_limiter + return @admin_api_key_limiter if @admin_api_key_limiter + + limit = GlobalSetting.max_admin_api_reqs_per_minute.to_i + if GlobalSetting.respond_to?(:max_admin_api_reqs_per_key_per_minute) + Discourse.deprecate("DISCOURSE_MAX_ADMIN_API_REQS_PER_KEY_PER_MINUTE is deprecated. Please use DISCOURSE_MAX_ADMIN_API_REQS_PER_MINUTE", drop_from: '2.9.0') + limit = [ + GlobalSetting.max_admin_api_reqs_per_key_per_minute.to_i, + limit + ].max + end + @admin_api_key_limiter = RateLimiter.new( + nil, + "admin_api_min", + limit, + 60, + error_code: "admin_api_key_rate_limit" + ) + end + + def user_api_key_limiter_60_secs + @user_api_key_limiter_60_secs ||= RateLimiter.new( + nil, + "user_api_min_#{@hashed_user_api_key}", + GlobalSetting.max_user_api_reqs_per_minute, + 60, + error_code: "user_api_key_limiter_60_secs" + ) + end + + def user_api_key_limiter_1_day + @user_api_key_limiter_1_day ||= RateLimiter.new( + nil, + "user_api_day_#{@hashed_user_api_key}", + GlobalSetting.max_user_api_reqs_per_day, + 86400, + error_code: "user_api_key_limiter_1_day" + ) + end + + def find_auth_token + return @auth_token if defined?(@auth_token) + + @auth_token = begin + if v0 = self.class.find_v0_auth_cookie(@request) + v0 + elsif v1 = self.class.find_v1_auth_cookie(@env) + if v1[:issued_at] >= SiteSetting.maximum_session_age.hours.ago.to_i + v1[:token] + end + end + end + end end diff --git a/lib/guardian.rb b/lib/guardian.rb index a4af71e2a5..a0ba295b5d 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -529,9 +529,16 @@ class Guardian end def auth_token - if cookie = request&.cookies[Auth::DefaultCurrentUserProvider::TOKEN_COOKIE] - UserAuthToken.hash_token(cookie) + return if !request + + token = Auth::DefaultCurrentUserProvider.find_v0_auth_cookie(request).presence + + if !token + cookie = Auth::DefaultCurrentUserProvider.find_v1_auth_cookie(request.env) + token = cookie[:token] if cookie end + + UserAuthToken.hash_token(token) if token end private diff --git a/lib/homepage_constraint.rb b/lib/homepage_constraint.rb index 7c04acebb2..ef6686d5fd 100644 --- a/lib/homepage_constraint.rb +++ b/lib/homepage_constraint.rb @@ -8,8 +8,8 @@ class HomePageConstraint def matches?(request) return @filter == 'finish_installation' if SiteSetting.has_login_hint? - provider = Discourse.current_user_provider.new(request.env) - homepage = provider&.current_user&.user_option&.homepage || SiteSetting.anonymous_homepage + current_user = CurrentUser.lookup_from_env(request.env) + homepage = current_user&.user_option&.homepage || SiteSetting.anonymous_homepage homepage == @filter rescue Discourse::InvalidAccess, Discourse::ReadOnly false diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb index cb06d8793f..059b6d457f 100644 --- a/lib/middleware/anonymous_cache.rb +++ b/lib/middleware/anonymous_cache.rb @@ -49,9 +49,9 @@ module Middleware ACCEPT_ENCODING = "HTTP_ACCEPT_ENCODING" DISCOURSE_RENDER = "HTTP_DISCOURSE_RENDER" - def initialize(env) + def initialize(env, request = nil) @env = env - @request = Rack::Request.new(@env) + @request = request || Rack::Request.new(@env) end def blocked_crawler? diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb index b5fe3216ca..fa035a0087 100644 --- a/lib/middleware/request_tracker.rb +++ b/lib/middleware/request_tracker.rb @@ -4,7 +4,6 @@ require 'method_profiler' require 'middleware/anonymous_cache' class Middleware::RequestTracker - @@detailed_request_loggers = nil @@ip_skipper = nil @@ -56,6 +55,10 @@ class Middleware::RequestTracker @@ip_skipper = blk end + def self.ip_skipper + @@ip_skipper + end + def initialize(app, settings = {}) @app = app end @@ -92,23 +95,25 @@ class Middleware::RequestTracker end end - def self.get_data(env, result, timing) + def self.get_data(env, result, timing, request = nil) status, headers = result status = status.to_i - helper = Middleware::AnonymousCache::Helper.new(env) - request = Rack::Request.new(env) + request ||= Rack::Request.new(env) + helper = Middleware::AnonymousCache::Helper.new(env, request) env_track_view = env["HTTP_DISCOURSE_TRACK_VIEW"] track_view = status == 200 track_view &&= env_track_view != "0" && env_track_view != "false" track_view &&= env_track_view || (request.get? && !request.xhr? && headers["Content-Type"] =~ /text\/html/) track_view = !!track_view + has_auth_cookie = Auth::DefaultCurrentUserProvider.find_v0_auth_cookie(request).present? + has_auth_cookie ||= Auth::DefaultCurrentUserProvider.find_v1_auth_cookie(env).present? h = { status: status, is_crawler: helper.is_crawler?, - has_auth_cookie: helper.has_auth_cookie?, + has_auth_cookie: has_auth_cookie, is_background: !!(request.path =~ /^\/message-bus\// || request.path =~ /\/topics\/timings/), is_mobile: helper.is_mobile?, track_view: track_view, @@ -132,9 +137,9 @@ class Middleware::RequestTracker h end - def log_request_info(env, result, info) + def log_request_info(env, result, info, request = nil) # we got to skip this on error ... its just logging - data = self.class.get_data(env, result, info) rescue nil + data = self.class.get_data(env, result, info, request) rescue nil if data if result && (headers = result[1]) @@ -165,7 +170,7 @@ class Middleware::RequestTracker def call(env) result = nil - log_request = true + info = nil # doing this as early as possible so we have an # accurate counter @@ -173,14 +178,20 @@ class Middleware::RequestTracker request = Rack::Request.new(env) - if available_in = rate_limit(request) - return [ - 429, - { "Retry-After" => available_in.to_s }, - ["Slow down, too many requests from this IP address"] - ] + cookie = find_auth_cookie(env) + if error_details = rate_limit(request, cookie) + available_in, error_code = error_details + message = <<~TEXT + Slow down, too many requests from this IP address. + Please retry again in #{available_in} seconds. + Error code: #{error_code}. + TEXT + headers = { + "Retry-After" => available_in.to_s, + "Discourse-Rate-Limit-Error-Code" => error_code + } + return [429, headers, [message]] end - env["discourse.request_tracker"] = self MethodProfiler.start @@ -222,93 +233,8 @@ class Middleware::RequestTracker end end end - log_request_info(env, result, info) unless !log_request || env["discourse.request_tracker.skip"] - end - - def is_private_ip?(ip) - ip = IPAddr.new(ip) rescue nil - !!(ip && (ip.private? || ip.loopback?)) - end - - def rate_limit(request) - if ( - GlobalSetting.max_reqs_per_ip_mode == "block" || - GlobalSetting.max_reqs_per_ip_mode == "warn" || - GlobalSetting.max_reqs_per_ip_mode == "warn+block" - ) - - ip = request.ip - - if !GlobalSetting.max_reqs_rate_limit_on_private - return false if is_private_ip?(ip) - end - - return false if @@ip_skipper&.call(ip) - return false if STATIC_IP_SKIPPER&.any? { |entry| entry.include?(ip) } - - limiter10 = RateLimiter.new( - nil, - "global_ip_limit_10_#{ip}", - GlobalSetting.max_reqs_per_ip_per_10_seconds, - 10, - global: true, - aggressive: true - ) - - limiter60 = RateLimiter.new( - nil, - "global_ip_limit_60_#{ip}", - GlobalSetting.max_reqs_per_ip_per_minute, - 60, - global: true, - aggressive: true - ) - - limiter_assets10 = RateLimiter.new( - nil, - "global_ip_limit_10_assets_#{ip}", - GlobalSetting.max_asset_reqs_per_ip_per_10_seconds, - 10, - global: true - ) - - request.env['DISCOURSE_RATE_LIMITERS'] = [limiter10, limiter60] - request.env['DISCOURSE_ASSET_RATE_LIMITERS'] = [limiter_assets10] - - warn = GlobalSetting.max_reqs_per_ip_mode == "warn" || GlobalSetting.max_reqs_per_ip_mode == "warn+block" - - if !limiter_assets10.can_perform? - if warn - Discourse.warn("Global asset IP rate limit exceeded for #{ip}: 10 second rate limit", uri: request.env["REQUEST_URI"]) - end - - if GlobalSetting.max_reqs_per_ip_mode != "warn" - return limiter_assets10.seconds_to_wait(Time.now.to_i) - else - return false - end - end - - begin - type = 10 - limiter10.performed! - - type = 60 - limiter60.performed! - - false - rescue RateLimiter::LimitExceeded => e - if warn - Discourse.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit", uri: request.env["REQUEST_URI"]) - if GlobalSetting.max_reqs_per_ip_mode != "warn" - e.available_in - else - false - end - else - e.available_in - end - end + if !env["discourse.request_tracker.skip"] + log_request_info(env, result, info, request) end end @@ -319,4 +245,108 @@ class Middleware::RequestTracker end end end + + def find_auth_cookie(env) + min_allowed_timestamp = Time.now.to_i - (UserAuthToken::ROTATE_TIME_MINS + 1) * 60 + cookie = Auth::DefaultCurrentUserProvider.find_v1_auth_cookie(env) + if cookie && cookie[:issued_at] >= min_allowed_timestamp + cookie + end + end + + def is_private_ip?(ip) + ip = IPAddr.new(ip) + !!(ip && (ip.private? || ip.loopback?)) + rescue IPAddr::AddressFamilyError, IPAddr::InvalidAddressError + false + end + + def rate_limit(request, cookie) + warn = GlobalSetting.max_reqs_per_ip_mode == "warn" || + GlobalSetting.max_reqs_per_ip_mode == "warn+block" + block = GlobalSetting.max_reqs_per_ip_mode == "block" || + GlobalSetting.max_reqs_per_ip_mode == "warn+block" + + return if !block && !warn + + ip = request.ip + + if !GlobalSetting.max_reqs_rate_limit_on_private + return if is_private_ip?(ip) + end + + return if @@ip_skipper&.call(ip) + return if STATIC_IP_SKIPPER&.any? { |entry| entry.include?(ip) } + + ip_or_id = ip + limit_on_id = false + if cookie && cookie[:user_id] && cookie[:trust_level] && cookie[:trust_level] >= GlobalSetting.skip_per_ip_rate_limit_trust_level + ip_or_id = cookie[:user_id] + limit_on_id = true + end + + limiter10 = RateLimiter.new( + nil, + "global_ip_limit_10_#{ip_or_id}", + GlobalSetting.max_reqs_per_ip_per_10_seconds, + 10, + global: !limit_on_id, + aggressive: true, + error_code: limit_on_id ? "id_10_secs_limit" : "ip_10_secs_limit" + ) + + limiter60 = RateLimiter.new( + nil, + "global_ip_limit_60_#{ip_or_id}", + GlobalSetting.max_reqs_per_ip_per_minute, + 60, + global: !limit_on_id, + error_code: limit_on_id ? "id_60_secs_limit" : "ip_60_secs_limit", + aggressive: true + ) + + limiter_assets10 = RateLimiter.new( + nil, + "global_ip_limit_10_assets_#{ip_or_id}", + GlobalSetting.max_asset_reqs_per_ip_per_10_seconds, + 10, + error_code: limit_on_id ? "id_assets_10_secs_limit" : "ip_assets_10_secs_limit", + global: !limit_on_id + ) + + request.env['DISCOURSE_RATE_LIMITERS'] = [limiter10, limiter60] + request.env['DISCOURSE_ASSET_RATE_LIMITERS'] = [limiter_assets10] + + if !limiter_assets10.can_perform? + if warn + Discourse.warn("Global asset IP rate limit exceeded for #{ip}: 10 second rate limit", uri: request.env["REQUEST_URI"]) + end + + if block + return [ + limiter_assets10.seconds_to_wait(Time.now.to_i), + limiter_assets10.error_code + ] + end + end + + begin + type = 10 + limiter10.performed! + + type = 60 + limiter60.performed! + + nil + rescue RateLimiter::LimitExceeded => e + if warn + Discourse.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit", uri: request.env["REQUEST_URI"]) + end + if block + [e.available_in, e.error_code] + else + nil + end + end + end end diff --git a/lib/rate_limiter.rb b/lib/rate_limiter.rb index 12f565bf17..f7572d4b05 100644 --- a/lib/rate_limiter.rb +++ b/lib/rate_limiter.rb @@ -3,7 +3,7 @@ # A redis backed rate limiter. class RateLimiter - attr_reader :max, :secs, :user, :key + attr_reader :max, :secs, :user, :key, :error_code def self.key_prefix "l-rate-limit3:" @@ -37,7 +37,7 @@ class RateLimiter "#{RateLimiter.key_prefix}:#{@user && @user.id}:#{type}" end - def initialize(user, type, max, secs, global: false, aggressive: false) + def initialize(user, type, max, secs, global: false, aggressive: false, error_code: nil) @user = user @type = type @key = build_key(type) @@ -45,6 +45,7 @@ class RateLimiter @secs = secs @global = global @aggressive = aggressive + @error_code = error_code end def clear! @@ -55,7 +56,7 @@ class RateLimiter rate_unlimited? || is_under_limit? end - def seconds_to_wait(now) + def seconds_to_wait(now = Time.now.to_i) @secs - age_of_oldest(now) end @@ -116,7 +117,7 @@ class RateLimiter now = Time.now.to_i if ((max || 0) <= 0) || rate_limiter_allowed?(now) - raise RateLimiter::LimitExceeded.new(seconds_to_wait(now), @type) if raise_error + raise RateLimiter::LimitExceeded.new(seconds_to_wait(now), @type, @error_code) if raise_error false else true diff --git a/lib/rate_limiter/limit_exceeded.rb b/lib/rate_limiter/limit_exceeded.rb index f9f4c8a3aa..0109dbf9e5 100644 --- a/lib/rate_limiter/limit_exceeded.rb +++ b/lib/rate_limiter/limit_exceeded.rb @@ -16,11 +16,12 @@ class RateLimiter # A rate limit has been exceeded. class LimitExceeded < StandardError - attr_reader :type, :available_in + attr_reader :type, :available_in, :error_code - def initialize(available_in, type = nil) + def initialize(available_in, type = nil, error_code = nil) @available_in = available_in @type = type + @error_code = error_code end def time_left diff --git a/lib/staff_constraint.rb b/lib/staff_constraint.rb index a90e264da1..3f5e5a87c4 100644 --- a/lib/staff_constraint.rb +++ b/lib/staff_constraint.rb @@ -3,10 +3,8 @@ class StaffConstraint def matches?(request) - provider = Discourse.current_user_provider.new(request.env) - provider.current_user && - provider.current_user.staff? && - custom_staff_check(request) + current_user = CurrentUser.lookup_from_env(request.env) + current_user&.staff? && custom_staff_check(request) rescue Discourse::InvalidAccess, Discourse::ReadOnly false end diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb index 502e289f86..d684a0f540 100644 --- a/spec/components/auth/default_current_user_provider_spec.rb +++ b/spec/components/auth/default_current_user_provider_spec.rb @@ -13,16 +13,42 @@ describe Auth::DefaultCurrentUserProvider do def initialize(env) super(env) end + + def cookie_jar + @cookie_jar ||= ActionDispatch::Request.new(env).cookie_jar + end end def provider(url, opts = nil) opts ||= { method: "GET" } - env = Rack::MockRequest.env_for(url, opts) + env = create_request_env(path: url).merge(opts) TestProvider.new(env) end + def get_cookie_info(cookie_jar, name) + headers = {} + cookie_jar.always_write_cookie = true + cookie_jar.write(headers) + + header = headers["Set-Cookie"] + return if header.nil? + + info = {} + + line = header.split("\n").find { |l| l.start_with?("#{name}=") } + parts = line.split(";").map(&:strip) + + info[:value] = parts.shift.split("=")[1] + parts.each do |p| + key, value = p.split("=") + info[key.downcase.to_sym] = value || true + end + + info + end + it "can be used to pretend that a user doesn't exist" do - provider = TestProvider.new({}) + provider = TestProvider.new(create_request_env(path: "/")) expect(provider.current_user).to eq(nil) end @@ -234,11 +260,10 @@ describe Auth::DefaultCurrentUserProvider do end describe "#current_user" do - let(:unhashed_token) do + let(:cookie) do new_provider = provider('/') - cookies = {} - new_provider.log_on_user(user, {}, cookies) - cookies["_t"][:value] + new_provider.log_on_user(user, {}, new_provider.cookie_jar) + new_provider.cookie_jar["_t"] end before do @@ -251,7 +276,7 @@ describe Auth::DefaultCurrentUserProvider do end it "should not update last seen for suspended users" do - provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}") + provider2 = provider("/", "HTTP_COOKIE" => "_t=#{cookie}") u = provider2.current_user u.reload expect(u.last_seen_at).to eq_time(Time.zone.now) @@ -264,7 +289,7 @@ describe Auth::DefaultCurrentUserProvider do u.clear_last_seen_cache! - provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}") + provider2 = provider("/", "HTTP_COOKIE" => "_t=#{cookie}") expect(provider2.current_user).to eq(nil) u.reload @@ -281,7 +306,7 @@ describe Auth::DefaultCurrentUserProvider do end it "should not update User#last_seen_at" do - provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}") + provider2 = provider("/", "HTTP_COOKIE" => "_t=#{cookie}") u = provider2.current_user u.reload expect(u.last_seen_at).to eq(nil) @@ -324,19 +349,26 @@ describe Auth::DefaultCurrentUserProvider do SiteSetting.persistent_sessions = false @provider = provider('/') - cookies = {} - @provider.log_on_user(user, {}, cookies) + @provider.log_on_user(user, {}, @provider.cookie_jar) - expect(cookies["_t"][:expires]).to eq(nil) + cookie_info = get_cookie_info(@provider.cookie_jar, "_t") + expect(cookie_info[:expires]).to eq(nil) + end + + it "v0 of auth cookie is still acceptable" do + token = UserAuthToken.generate!(user_id: user.id).unhashed_auth_token + ip = "10.0.0.1" + env = { "HTTP_COOKIE" => "_t=#{token}", "REMOTE_ADDR" => ip } + expect(provider('/', env).current_user.id).to eq(user.id) end it "correctly rotates tokens" do SiteSetting.maximum_session_age = 3 @provider = provider('/') - cookies = {} - @provider.log_on_user(user, {}, cookies) + @provider.log_on_user(user, {}, @provider.cookie_jar) - unhashed_token = cookies["_t"][:value] + cookie = @provider.cookie_jar["_t"] + unhashed_token = decrypt_auth_cookie(cookie)[:token] token = UserAuthToken.find_by(user_id: user.id) @@ -347,15 +379,19 @@ describe Auth::DefaultCurrentUserProvider do # at this point we are going to try to rotate token freeze_time 20.minutes.from_now - provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}") + provider2 = provider("/", "HTTP_COOKIE" => "_t=#{cookie}") provider2.current_user token.reload expect(token.auth_token_seen).to eq(true) - cookies = {} - provider2.refresh_session(user, {}, cookies) - expect(cookies["_t"][:value]).not_to eq(unhashed_token) + provider2.refresh_session(user, {}, provider2.cookie_jar) + expect( + decrypt_auth_cookie(provider2.cookie_jar["_t"])[:token] + ).not_to eq(unhashed_token) + expect( + decrypt_auth_cookie(provider2.cookie_jar["_t"])[:token].size + ).to eq(32) token.reload expect(token.auth_token_seen).to eq(false) @@ -366,10 +402,10 @@ describe Auth::DefaultCurrentUserProvider do unverified_token = token.auth_token # old token should still work - provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}") + provider2 = provider("/", "HTTP_COOKIE" => "_t=#{cookie}") expect(provider2.current_user.id).to eq(user.id) - provider2.refresh_session(user, {}, cookies) + provider2.refresh_session(user, {}, provider2.cookie_jar) token.reload @@ -394,23 +430,23 @@ describe Auth::DefaultCurrentUserProvider do it "fires event when updating last seen" do @provider = provider('/') - cookies = {} - @provider.log_on_user(user, {}, cookies) - unhashed_token = cookies["_t"][:value] + @provider.log_on_user(user, {}, @provider.cookie_jar) + cookie = @provider.cookie_jar["_t"] + unhashed_token = decrypt_auth_cookie(cookie)[:token] freeze_time 20.minutes.from_now - provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}") - provider2.refresh_session(user, {}, {}) + provider2 = provider("/", "HTTP_COOKIE" => "_t=#{cookie}") + provider2.refresh_session(user, {}, provider2.cookie_jar) expect(@refreshes).to eq(1) end it "does not fire an event when last seen does not update" do @provider = provider('/') - cookies = {} - @provider.log_on_user(user, {}, cookies) - unhashed_token = cookies["_t"][:value] + @provider.log_on_user(user, {}, @provider.cookie_jar) + cookie = @provider.cookie_jar["_t"] + unhashed_token = decrypt_auth_cookie(cookie)[:token] freeze_time 2.minutes.from_now - provider2 = provider("/", "HTTP_COOKIE" => "_t=#{unhashed_token}") - provider2.refresh_session(user, {}, {}) + provider2 = provider("/", "HTTP_COOKIE" => "_t=#{cookie}") + provider2.refresh_session(user, {}, provider2.cookie_jar) expect(@refreshes).to eq(0) end end @@ -423,14 +459,28 @@ describe Auth::DefaultCurrentUserProvider do it "can only try 10 bad cookies a minute" do token = UserAuthToken.generate!(user_id: user.id) + cookie = create_auth_cookie( + token: token.unhashed_auth_token, + user_id: user.id, + trust_level: user.trust_level, + issued_at: 5.minutes.ago + ) - provider('/').log_on_user(user, {}, {}) + @provider = provider('/') + @provider.log_on_user(user, {}, @provider.cookie_jar) RateLimiter.new(nil, "cookie_auth_10.0.0.1", 10, 60).clear! RateLimiter.new(nil, "cookie_auth_10.0.0.2", 10, 60).clear! ip = "10.0.0.1" - env = { "HTTP_COOKIE" => "_t=#{SecureRandom.hex}", "REMOTE_ADDR" => ip } + bad_cookie = create_auth_cookie( + token: SecureRandom.hex, + user_id: user.id, + trust_level: user.trust_level, + issued_at: 5.minutes.ago, + ) + + env = { "HTTP_COOKIE" => "_t=#{bad_cookie}", "REMOTE_ADDR" => ip } 10.times do provider('/', env).current_user @@ -441,7 +491,7 @@ describe Auth::DefaultCurrentUserProvider do }.to raise_error(Discourse::InvalidAccess) expect { - env["HTTP_COOKIE"] = "_t=#{token.unhashed_auth_token}" + env["HTTP_COOKIE"] = "_t=#{cookie}" provider("/", env).current_user }.to raise_error(Discourse::InvalidAccess) @@ -454,14 +504,23 @@ describe Auth::DefaultCurrentUserProvider do end it "correctly removes invalid cookies" do - cookies = { "_t" => SecureRandom.hex } - provider('/').refresh_session(nil, {}, cookies) - expect(cookies.key?("_t")).to eq(false) + bad_cookie = create_auth_cookie( + token: SecureRandom.hex, + user_id: 1, + trust_level: 4, + issued_at: 5.minutes.ago, + ) + @provider = provider('/') + @provider.cookie_jar["_t"] = bad_cookie + @provider.refresh_session(nil, {}, @provider.cookie_jar) + expect(@provider.cookie_jar.key?("_t")).to eq(false) end it "logging on user always creates a new token" do - provider('/').log_on_user(user, {}, {}) - provider('/').log_on_user(user, {}, {}) + @provider = provider('/') + @provider.log_on_user(user, {}, @provider.cookie_jar) + @provider2 = provider('/') + @provider2.log_on_user(user, {}, @provider2.cookie_jar) expect(UserAuthToken.where(user_id: user.id).count).to eq(2) end @@ -484,7 +543,8 @@ describe Auth::DefaultCurrentUserProvider do expect(UserAuthToken.where(auth_token: (1..3).map { |i| "abc#{i}" }).count).to eq(3) # On next login, gets fixed - provider('/').log_on_user(user, {}, {}) + @provider = provider('/') + @provider.log_on_user(user, {}, @provider.cookie_jar) expect(UserAuthToken.where(user_id: user.id).count).to eq(UserAuthToken::MAX_SESSION_COUNT) # Oldest sessions are 1, 2, 3. They should now be deleted @@ -495,38 +555,48 @@ describe Auth::DefaultCurrentUserProvider do SiteSetting.force_https = false SiteSetting.same_site_cookies = "Lax" - cookies = {} - provider('/').log_on_user(user, {}, cookies) + @provider = provider('/') + @provider.log_on_user(user, {}, @provider.cookie_jar) - expect(cookies["_t"][:same_site]).to eq("Lax") - expect(cookies["_t"][:httponly]).to eq(true) - expect(cookies["_t"][:secure]).to eq(false) + cookie_info = get_cookie_info(@provider.cookie_jar, "_t") + expect(cookie_info[:samesite]).to eq("Lax") + expect(cookie_info[:httponly]).to eq(true) + expect(cookie_info.key?(:secure)).to eq(false) SiteSetting.force_https = true SiteSetting.same_site_cookies = "Disabled" - cookies = {} - provider('/').log_on_user(user, {}, cookies) + @provider = provider('/') + @provider.log_on_user(user, {}, @provider.cookie_jar) - expect(cookies["_t"][:secure]).to eq(true) - expect(cookies["_t"].key?(:same_site)).to eq(false) + cookie_info = get_cookie_info(@provider.cookie_jar, "_t") + expect(cookie_info[:secure]).to eq(true) + expect(cookie_info.key?(:same_site)).to eq(false) end it "correctly expires session" do SiteSetting.maximum_session_age = 2 token = UserAuthToken.generate!(user_id: user.id) + cookie = create_auth_cookie( + token: token.unhashed_auth_token, + user_id: user.id, + trust_level: user.trust_level, + issued_at: 5.minutes.ago + ) - provider('/').log_on_user(user, {}, {}) + @provider = provider('/') + @provider.log_on_user(user, {}, @provider.cookie_jar) - expect(provider("/", "HTTP_COOKIE" => "_t=#{token.unhashed_auth_token}").current_user.id).to eq(user.id) + expect(provider("/", "HTTP_COOKIE" => "_t=#{cookie}").current_user.id).to eq(user.id) freeze_time 3.hours.from_now - expect(provider("/", "HTTP_COOKIE" => "_t=#{token.unhashed_auth_token}").current_user).to eq(nil) + expect(provider("/", "HTTP_COOKIE" => "_t=#{cookie}").current_user).to eq(nil) end it "always unstage users" do user.update!(staged: true) - provider("/").log_on_user(user, {}, {}) + @provider = provider("/") + @provider.log_on_user(user, {}, @provider.cookie_jar) user.reload expect(user.staged).to eq(false) end @@ -658,4 +728,16 @@ describe Auth::DefaultCurrentUserProvider do end end end + + it "ignores a valid auth cookie that has been tampered with" do + @provider = provider('/') + @provider.log_on_user(user, {}, @provider.cookie_jar) + + cookie = @provider.cookie_jar["_t"] + cookie = swap_2_different_characters(cookie) + + ip = "10.0.0.1" + env = { "HTTP_COOKIE" => "_t=#{cookie}", "REMOTE_ADDR" => ip } + expect(provider('/', env).current_user).to eq(nil) + end end diff --git a/spec/components/current_user_spec.rb b/spec/components/current_user_spec.rb index 78310be245..e8ec24118c 100644 --- a/spec/components/current_user_spec.rb +++ b/spec/components/current_user_spec.rb @@ -7,7 +7,16 @@ describe CurrentUser do user = Fabricate(:user, active: true) token = UserAuthToken.generate!(user_id: user.id) - env = Rack::MockRequest.env_for("/test", "HTTP_COOKIE" => "_t=#{token.unhashed_auth_token};") + cookie = create_auth_cookie( + token: token.unhashed_auth_token, + user_id: user.id, + trust_level: user.trust_level, + issued_at: 5.minutes.ago, + ) + + env = create_request_env(path: "/test").merge( + "HTTP_COOKIE" => "_t=#{cookie};" + ) expect(CurrentUser.lookup_from_env(env)).to eq(user) end diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index 3ff0420bb2..86e45b0bfd 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -3846,9 +3846,24 @@ describe Guardian do describe '#auth_token' do it 'returns the correct auth token' do token = UserAuthToken.generate!(user_id: user.id) - env = Rack::MockRequest.env_for("/", "HTTP_COOKIE" => "_t=#{token.unhashed_auth_token};") + cookie = create_auth_cookie( + token: token.unhashed_auth_token, + user_id: user.id, + trust_level: user.trust_level, + issued_at: 5.minutes.ago, + ) + env = create_request_env(path: "/").merge("HTTP_COOKIE" => "_t=#{cookie};") - guardian = Guardian.new(user, Rack::Request.new(env)) + guardian = Guardian.new(user, ActionDispatch::Request.new(env)) + expect(guardian.auth_token).to eq(token.auth_token) + end + + it 'supports v0 of auth cookie' do + token = UserAuthToken.generate!(user_id: user.id) + cookie = token.unhashed_auth_token + env = create_request_env(path: "/").merge("HTTP_COOKIE" => "_t=#{cookie};") + + guardian = Guardian.new(user, ActionDispatch::Request.new(env)) expect(guardian.auth_token).to eq(token.auth_token) end end diff --git a/spec/components/hijack_spec.rb b/spec/components/hijack_spec.rb index 416ee4102b..b75e522acb 100644 --- a/spec/components/hijack_spec.rb +++ b/spec/components/hijack_spec.rb @@ -58,7 +58,7 @@ describe Hijack do end end - env = {} + env = create_request_env(path: "/") middleware = Middleware::RequestTracker.new(app) middleware.call(env) diff --git a/spec/components/middleware/anonymous_cache_spec.rb b/spec/components/middleware/anonymous_cache_spec.rb index 9cf0e05866..0d7868401c 100644 --- a/spec/components/middleware/anonymous_cache_spec.rb +++ b/spec/components/middleware/anonymous_cache_spec.rb @@ -6,7 +6,7 @@ describe Middleware::AnonymousCache do let(:middleware) { Middleware::AnonymousCache.new(lambda { |_| [200, {}, []] }) } def env(opts = {}) - Rack::MockRequest.env_for("http://test.com/path?bla=1").merge(opts) + create_request_env(path: "http://test.com/path?bla=1").merge(opts) end describe Middleware::AnonymousCache::Helper do @@ -23,8 +23,15 @@ describe Middleware::AnonymousCache do expect(new_helper("ANON_CACHE_DURATION" => 10, "REQUEST_METHOD" => "POST").cacheable?).to eq(false) end - it "is false if it has an auth cookie" do - expect(new_helper("HTTP_COOKIE" => "jack=1; _t=#{"1" * 32}; jill=2").cacheable?).to eq(false) + it "is false if it has a valid auth cookie" do + cookie = create_auth_cookie(token: SecureRandom.hex) + expect(new_helper("HTTP_COOKIE" => "jack=1; _t=#{cookie}; jill=2").cacheable?).to eq(false) + end + + it "is true if it has an invalid auth cookie" do + cookie = create_auth_cookie(token: SecureRandom.hex, issued_at: 5.minutes.ago) + cookie = swap_2_different_characters(cookie) + expect(new_helper("HTTP_COOKIE" => "jack=1; _t=#{cookie}; jill=2").cacheable?).to eq(true) end it "is false for srv/status routes" do @@ -142,14 +149,15 @@ describe Middleware::AnonymousCache do global_setting :background_requests_max_queue_length, "0.5" - env = { - "HTTP_COOKIE" => "_t=#{SecureRandom.hex}", + cookie = create_auth_cookie(token: SecureRandom.hex) + env = create_request_env.merge( + "HTTP_COOKIE" => "_t=#{cookie}", "HOST" => "site.com", "REQUEST_METHOD" => "GET", "REQUEST_URI" => "/somewhere/rainbow", "REQUEST_QUEUE_SECONDS" => 2.1, "rack.input" => StringIO.new - } + ) # non background ... long request env["REQUEST_QUEUE_SECONDS"] = 2 @@ -194,15 +202,16 @@ describe Middleware::AnonymousCache do global_setting :force_anonymous_min_per_10_seconds, 2 global_setting :force_anonymous_min_queue_seconds, 1 - env = { - "HTTP_COOKIE" => "_t=#{SecureRandom.hex}", + cookie = create_auth_cookie(token: SecureRandom.hex) + env = create_request_env.merge( + "HTTP_COOKIE" => "_t=#{cookie}", "HTTP_DISCOURSE_LOGGED_IN" => "true", "HOST" => "site.com", "REQUEST_METHOD" => "GET", "REQUEST_URI" => "/somewhere/rainbow", "REQUEST_QUEUE_SECONDS" => 2.1, "rack.input" => StringIO.new - } + ) is_anon = false app.call(env.dup) diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb index 63d9411b1f..4cdab112c7 100644 --- a/spec/components/middleware/request_tracker_spec.rb +++ b/spec/components/middleware/request_tracker_spec.rb @@ -3,16 +3,15 @@ require "rails_helper" describe Middleware::RequestTracker do - def env(opts = {}) - { + create_request_env.merge( "HTTP_HOST" => "http://test.com", "HTTP_USER_AGENT" => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36", "REQUEST_URI" => "/path?bla=1", "REQUEST_METHOD" => "GET", "HTTP_ACCEPT" => "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8", - "rack.input" => "" - }.merge(opts) + "rack.input" => StringIO.new + ).merge(opts) end before do @@ -140,9 +139,15 @@ describe Middleware::RequestTracker do let(:logged_in_data) do user = Fabricate(:user, active: true) token = UserAuthToken.generate!(user_id: user.id) + cookie = create_auth_cookie( + token: token.unhashed_auth_token, + user_id: user.id, + trust_level: user.trust_level, + issued_at: 5.minutes.ago + ) Middleware::RequestTracker.get_data(env( "HTTP_USER_AGENT" => "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.72 Safari/537.36", - "HTTP_COOKIE" => "_t=#{token.unhashed_auth_token};" + "HTTP_COOKIE" => "_t=#{cookie};" ), ["200", { "Content-Type" => 'text/html' }], 0.1) end @@ -195,6 +200,7 @@ describe Middleware::RequestTracker do before do RateLimiter.enable RateLimiter.clear_all_global! + RateLimiter.clear_all! @old_logger = Rails.logger Rails.logger = TestLogger.new @@ -386,6 +392,177 @@ describe Middleware::RequestTracker do status, _ = middleware.call(env2) expect(status).to eq(200) end + + describe "diagnostic information" do + it "is included when the requests-per-10-seconds limit is reached" do + global_setting :max_reqs_per_ip_per_10_seconds, 1 + called = 0 + app = lambda do |_| + called += 1 + [200, {}, ["OK"]] + end + env = env("REMOTE_ADDR" => "1.1.1.1") + middleware = Middleware::RequestTracker.new(app) + status, = middleware.call(env) + expect(status).to eq(200) + expect(called).to eq(1) + + env = env("REMOTE_ADDR" => "1.1.1.1") + middleware = Middleware::RequestTracker.new(app) + status, headers, response = middleware.call(env) + expect(status).to eq(429) + expect(called).to eq(1) + expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq("ip_10_secs_limit") + expect(response.first).to include("Error code: ip_10_secs_limit.") + end + + it "is included when the requests-per-minute limit is reached" do + global_setting :max_reqs_per_ip_per_minute, 1 + called = 0 + app = lambda do |_| + called += 1 + [200, {}, ["OK"]] + end + env = env("REMOTE_ADDR" => "1.1.1.1") + middleware = Middleware::RequestTracker.new(app) + status, = middleware.call(env) + expect(status).to eq(200) + expect(called).to eq(1) + + env = env("REMOTE_ADDR" => "1.1.1.1") + middleware = Middleware::RequestTracker.new(app) + status, headers, response = middleware.call(env) + expect(status).to eq(429) + expect(called).to eq(1) + expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq("ip_60_secs_limit") + expect(response.first).to include("Error code: ip_60_secs_limit.") + end + + it "is included when the assets-requests-per-10-seconds limit is reached" do + global_setting :max_asset_reqs_per_ip_per_10_seconds, 1 + called = 0 + app = lambda do |env| + called += 1 + env["DISCOURSE_IS_ASSET_PATH"] = true + [200, {}, ["OK"]] + end + env = env("REMOTE_ADDR" => "1.1.1.1") + middleware = Middleware::RequestTracker.new(app) + status, = middleware.call(env) + expect(status).to eq(200) + expect(called).to eq(1) + + env = env("REMOTE_ADDR" => "1.1.1.1") + middleware = Middleware::RequestTracker.new(app) + status, headers, response = middleware.call(env) + expect(status).to eq(429) + expect(called).to eq(1) + expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq("ip_assets_10_secs_limit") + expect(response.first).to include("Error code: ip_assets_10_secs_limit.") + end + end + + it "users with high enough trust level are not rate limited per ip" do + global_setting :max_reqs_per_ip_per_minute, 1 + global_setting :skip_per_ip_rate_limit_trust_level, 3 + + envs = 3.times.map do |n| + user = Fabricate(:user, trust_level: 3) + token = UserAuthToken.generate!(user_id: user.id) + cookie = create_auth_cookie( + token: token.unhashed_auth_token, + user_id: user.id, + trust_level: user.trust_level, + issued_at: 5.minutes.ago + ) + env("HTTP_COOKIE" => "_t=#{cookie}", "REMOTE_ADDR" => "1.1.1.1") + end + + called = 0 + app = lambda do |env| + called += 1 + [200, {}, ["OK"]] + end + envs.each do |env| + middleware = Middleware::RequestTracker.new(app) + status, = middleware.call(env) + expect(status).to eq(200) + end + expect(called).to eq(3) + + envs.each do |env| + middleware = Middleware::RequestTracker.new(app) + status, headers, response = middleware.call(env) + expect(status).to eq(429) + expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq("id_60_secs_limit") + expect(response.first).to include("Error code: id_60_secs_limit.") + end + expect(called).to eq(3) + end + + it "falls back to IP rate limiting if the cookie is too old" do + unfreeze_time + global_setting :max_reqs_per_ip_per_minute, 1 + global_setting :skip_per_ip_rate_limit_trust_level, 3 + user = Fabricate(:user, trust_level: 3) + token = UserAuthToken.generate!(user_id: user.id) + cookie = create_auth_cookie( + token: token.unhashed_auth_token, + user_id: user.id, + trust_level: user.trust_level, + issued_at: 5.minutes.ago + ) + env = env("HTTP_COOKIE" => "_t=#{cookie}", "REMOTE_ADDR" => "1.1.1.1") + + called = 0 + app = lambda do |_| + called += 1 + [200, {}, ["OK"]] + end + freeze_time(12.minutes.from_now) do + middleware = Middleware::RequestTracker.new(app) + status, = middleware.call(env) + expect(status).to eq(200) + + middleware = Middleware::RequestTracker.new(app) + status, headers, response = middleware.call(env) + expect(status).to eq(429) + expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq("ip_60_secs_limit") + expect(response.first).to include("Error code: ip_60_secs_limit.") + end + end + + it "falls back to IP rate limiting if the cookie is tampered with" do + unfreeze_time + global_setting :max_reqs_per_ip_per_minute, 1 + global_setting :skip_per_ip_rate_limit_trust_level, 3 + user = Fabricate(:user, trust_level: 3) + token = UserAuthToken.generate!(user_id: user.id) + cookie = create_auth_cookie( + token: token.unhashed_auth_token, + user_id: user.id, + trust_level: user.trust_level, + issued_at: Time.zone.now + ) + cookie = swap_2_different_characters(cookie) + env = env("HTTP_COOKIE" => "_t=#{cookie}", "REMOTE_ADDR" => "1.1.1.1") + + called = 0 + app = lambda do |_| + called += 1 + [200, {}, ["OK"]] + end + + middleware = Middleware::RequestTracker.new(app) + status, = middleware.call(env) + expect(status).to eq(200) + + middleware = Middleware::RequestTracker.new(app) + status, headers, response = middleware.call(env) + expect(status).to eq(429) + expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq("ip_60_secs_limit") + expect(response.first).to include("Error code: ip_60_secs_limit.") + end end context "callbacks" do @@ -480,5 +657,4 @@ describe Middleware::RequestTracker do expect(headers["X-Runtime"].to_f).to be > 0 end end - end diff --git a/spec/jobs/export_user_archive_spec.rb b/spec/jobs/export_user_archive_spec.rb index 8f083f172c..aab8af6a7f 100644 --- a/spec/jobs/export_user_archive_spec.rb +++ b/spec/jobs/export_user_archive_spec.rb @@ -42,10 +42,12 @@ describe Jobs::ExportUserArchive do user.user_profile.website = 'https://doe.example.com/john' user.user_profile.save # force a UserAuthTokenLog entry - Discourse.current_user_provider.new({ + env = create_request_env.merge( 'HTTP_USER_AGENT' => 'MyWebBrowser', 'REQUEST_PATH' => '/some_path/456852', - }).log_on_user(user, {}, {}) + ) + cookie_jar = ActionDispatch::Request.new(env).cookie_jar + Discourse.current_user_provider.new(env).log_on_user(user, {}, cookie_jar) # force a nonstandard post action PostAction.new(user: user, post: post, post_action_type_id: 5).save @@ -198,10 +200,12 @@ describe Jobs::ExportUserArchive do let(:component) { 'auth_tokens' } before do - Discourse.current_user_provider.new({ + env = create_request_env.merge( 'HTTP_USER_AGENT' => 'MyWebBrowser', 'REQUEST_PATH' => '/some_path/456852', - }).log_on_user(user, {}, {}) + ) + cookie_jar = ActionDispatch::Request.new(env).cookie_jar + Discourse.current_user_provider.new(env).log_on_user(user, {}, cookie_jar) end it 'properly includes session records' do diff --git a/spec/multisite/request_tracker_spec.rb b/spec/multisite/request_tracker_spec.rb new file mode 100644 index 0000000000..3d3a7c4ef8 --- /dev/null +++ b/spec/multisite/request_tracker_spec.rb @@ -0,0 +1,142 @@ +# frozen_string_literal: true + +require "rails_helper" + +describe "RequestTracker in multisite", type: :multisite do + before do + global_setting :skip_per_ip_rate_limit_trust_level, 2 + + RateLimiter.enable + + test_multisite_connection("default") do + RateLimiter.clear_all! + end + test_multisite_connection("second") do + RateLimiter.clear_all! + end + RateLimiter.clear_all_global! + end + + def call(env, &block) + Middleware::RequestTracker.new(block).call(env) + end + + def create_env(opts) + create_request_env.merge(opts) + end + + shared_examples "ip rate limiters behavior" do |error_code, app_callback| + it "applies rate limits on an IP address across all sites" do + called = { default: 0, second: 0 } + test_multisite_connection("default") do + env = create_env("REMOTE_ADDR" => "123.10.71.4") + status, = call(env) do + called[:default] += 1 + app_callback&.call(env) + [200, {}, ["OK"]] + end + expect(status).to eq(200) + + env = create_env("REMOTE_ADDR" => "123.10.71.4") + status, headers = call(env) do + called[:default] += 1 + app_callback&.call(env) + [200, {}, ["OK"]] + end + expect(status).to eq(429) + expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq(error_code) + expect(called[:default]).to eq(1) + end + + test_multisite_connection("second") do + env = create_env("REMOTE_ADDR" => "123.10.71.4") + status, headers = call(env) do + called[:second] += 1 + app_callback&.call(env) + [200, {}, ["OK"]] + end + expect(status).to eq(429) + expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq(error_code) + expect(called[:second]).to eq(0) + end + end + end + + shared_examples "user id rate limiters behavior" do |error_code, app_callback| + it "does not leak rate limits for a user id to other sites" do + cookie = create_auth_cookie( + token: SecureRandom.hex, + user_id: 1, + trust_level: 2 + ) + called = { default: 0, second: 0 } + test_multisite_connection("default") do + env = create_env("REMOTE_ADDR" => "123.10.71.4", "HTTP_COOKIE" => "_t=#{cookie}") + status, = call(env) do + called[:default] += 1 + app_callback&.call(env) + [200, {}, ["OK"]] + end + expect(status).to eq(200) + + env = create_env("REMOTE_ADDR" => "123.10.71.4", "HTTP_COOKIE" => "_t=#{cookie}") + status, headers, = call(env) do + called[:default] += 1 + app_callback&.call(env) + [200, {}, ["OK"]] + end + expect(status).to eq(429) + expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq(error_code) + expect(called[:default]).to eq(1) + end + + test_multisite_connection("second") do + env = create_env("REMOTE_ADDR" => "123.10.71.4", "HTTP_COOKIE" => "_t=#{cookie}") + status, = call(env) do + called[:second] += 1 + app_callback&.call(env) + [200, {}, ["OK"]] + end + expect(status).to eq(200) + + env = create_env("REMOTE_ADDR" => "123.10.71.4", "HTTP_COOKIE" => "_t=#{cookie}") + status, headers, = call(env) do + called[:second] += 1 + app_callback&.call(env) + [200, {}, ["OK"]] + end + expect(status).to eq(429) + expect(headers["Discourse-Rate-Limit-Error-Code"]).to eq(error_code) + expect(called[:second]).to eq(1) + end + end + end + + context "10 seconds limiter" do + before do + global_setting :max_reqs_per_ip_per_10_seconds, 1 + end + + include_examples "ip rate limiters behavior", "ip_10_secs_limit" + include_examples "user id rate limiters behavior", "id_10_secs_limit" + end + + context "60 seconds limiter" do + before do + global_setting :max_reqs_per_ip_per_minute, 1 + end + + include_examples "ip rate limiters behavior", "ip_60_secs_limit" + include_examples "user id rate limiters behavior", "id_60_secs_limit" + end + + context "assets 10 seconds limiter" do + before do + global_setting :max_asset_reqs_per_ip_per_10_seconds, 1 + end + + app_callback = ->(env) { env["DISCOURSE_IS_ASSET_PATH"] = true } + include_examples "ip rate limiters behavior", "ip_assets_10_secs_limit", app_callback + include_examples "user id rate limiters behavior", "id_assets_10_secs_limit", app_callback + end +end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 18e32104f2..3c7b68d79e 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -459,6 +459,44 @@ ensure Rails.logger = old_logger end +# this takes a string and returns a copy where 2 different +# characters are swapped. +# e.g. +# swap_2_different_characters("abc") => "bac" +# swap_2_different_characters("aac") => "caa" +def swap_2_different_characters(str) + swap1 = 0 + swap2 = str.split("").find_index { |c| c != str[swap1] } + # if the string is made up of 1 character + return str if !swap2 + str = str.dup + str[swap1], str[swap2] = str[swap2], str[swap1] + str +end + +def create_request_env(path: nil) + env = Rails.application.env_config.dup + env.merge!(Rack::MockRequest.env_for(path)) if path + env +end + +def create_auth_cookie(token:, user_id: nil, trust_level: nil, issued_at: Time.zone.now) + request = ActionDispatch::Request.new(create_request_env) + data = { + token: token, + user_id: user_id, + trust_level: trust_level, + issued_at: issued_at.to_i + } + cookie = request.cookie_jar.encrypted["_t"] = { value: data } + cookie[:value] +end + +def decrypt_auth_cookie(cookie) + request = ActionDispatch::Request.new(create_request_env.merge("HTTP_COOKIE" => "_t=#{cookie}")) + request.cookie_jar.encrypted["_t"] +end + class SpecSecureRandom class << self attr_accessor :value diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb index 610cebccbd..603d2f3fa0 100644 --- a/spec/requests/application_controller_spec.rb +++ b/spec/requests/application_controller_spec.rb @@ -851,4 +851,67 @@ RSpec.describe ApplicationController do expect(response.headers["Vary"]).to eq(nil) end end + + describe "Discourse-Rate-Limit-Error-Code header" do + fab!(:admin) { Fabricate(:admin) } + + before do + RateLimiter.clear_all! + RateLimiter.enable + end + + it "is included when API key is rate limited" do + global_setting :max_admin_api_reqs_per_minute, 1 + api_key = ApiKey.create!(user_id: admin.id).key + get "/latest.json", headers: { + "Api-Key": api_key, + "Api-Username": admin.username + } + expect(response.status).to eq(200) + + get "/latest.json", headers: { + "Api-Key": api_key, + "Api-Username": admin.username + } + expect(response.status).to eq(429) + expect(response.headers["Discourse-Rate-Limit-Error-Code"]).to eq("admin_api_key_rate_limit") + end + + it "is included when user API key is rate limited" do + global_setting :max_user_api_reqs_per_minute, 1 + user_api_key = UserApiKey.create!( + user_id: admin.id, + client_id: "", + application_name: "discourseapp" + ) + user_api_key.scopes = UserApiKeyScope.all_scopes.keys.map do |name| + UserApiKeyScope.create!(name: name, user_api_key_id: user_api_key.id) + end + user_api_key.save! + + get "/session/current.json", headers: { + "User-Api-Key": user_api_key.key, + } + expect(response.status).to eq(200) + + get "/session/current.json", headers: { + "User-Api-Key": user_api_key.key, + } + expect(response.status).to eq(429) + expect( + response.headers["Discourse-Rate-Limit-Error-Code"] + ).to eq("user_api_key_limiter_60_secs") + + global_setting :max_user_api_reqs_per_minute, 100 + global_setting :max_user_api_reqs_per_day, 1 + + get "/session/current.json", headers: { + "User-Api-Key": user_api_key.key, + } + expect(response.status).to eq(429) + expect( + response.headers["Discourse-Rate-Limit-Error-Code"] + ).to eq("user_api_key_limiter_1_day") + end + end end diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb index 18042a9efa..c4684a182e 100644 --- a/spec/requests/session_controller_spec.rb +++ b/spec/requests/session_controller_spec.rb @@ -1454,7 +1454,8 @@ RSpec.describe SessionController do expect(session[:current_user_id]).to eq(user.id) expect(user.user_auth_tokens.count).to eq(1) - expect(UserAuthToken.hash_token(cookies[:_t])).to eq(user.user_auth_tokens.first.auth_token) + unhashed_token = decrypt_auth_cookie(cookies[:_t])[:token] + expect(UserAuthToken.hash_token(unhashed_token)).to eq(user.user_auth_tokens.first.auth_token) end context "when timezone param is provided" do @@ -1640,7 +1641,8 @@ RSpec.describe SessionController do expect(session[:current_user_id]).to eq(user.id) expect(user.user_auth_tokens.count).to eq(1) - expect(UserAuthToken.hash_token(cookies[:_t])) + unhashed_token = decrypt_auth_cookie(cookies[:_t])[:token] + expect(UserAuthToken.hash_token(unhashed_token)) .to eq(user.user_auth_tokens.first.auth_token) end end @@ -1658,7 +1660,8 @@ RSpec.describe SessionController do expect(session[:current_user_id]).to eq(user.id) expect(user.user_auth_tokens.count).to eq(1) - expect(UserAuthToken.hash_token(cookies[:_t])) + unhashed_token = decrypt_auth_cookie(cookies[:_t])[:token] + expect(UserAuthToken.hash_token(unhashed_token)) .to eq(user.user_auth_tokens.first.auth_token) end end diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index 5a4e860644..e436e9f2b1 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -4857,11 +4857,18 @@ describe UsersController do it 'does not let user log out of current session' do token = UserAuthToken.generate!(user_id: user.id) - env = Rack::MockRequest.env_for("/", "HTTP_COOKIE" => "_t=#{token.unhashed_auth_token};") - Guardian.any_instance.stubs(:request).returns(Rack::Request.new(env)) + cookie = create_auth_cookie( + token: token.unhashed_auth_token, + user_id: user.id, + trust_level: user.trust_level, + issued_at: 5.minutes.ago, + ) - post "/u/#{user.username}/preferences/revoke-auth-token.json", params: { token_id: token.id } + post "/u/#{user.username}/preferences/revoke-auth-token.json", + params: { token_id: token.id }, + headers: { "HTTP_COOKIE" => "_t=#{cookie}" } + expect(token.reload.id).to be_present expect(response.status).to eq(400) end diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb index 417dcdca98..f0f02932c0 100644 --- a/spec/support/helpers.rb +++ b/spec/support/helpers.rb @@ -14,8 +14,9 @@ module Helpers end def log_in_user(user) + cookie_jar = ActionDispatch::Request.new(request.env).cookie_jar provider = Discourse.current_user_provider.new(request.env) - provider.log_on_user(user, session, cookies) + provider.log_on_user(user, session, cookie_jar) provider end From b96c10a90364dade1729d32ed5b771bc134d9e9f Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Thu, 18 Nov 2021 09:17:23 +1000 Subject: [PATCH 005/168] DEV: Extract shared external upload routes into controller helper (#14984) This commit refactors the direct external upload routes (get presigned put, complete external, create/abort/complete multipart) into a helper which is then included in both BackupController and the UploadController. This is done so UploadController doesn't need strange backup logic added to it, and so each controller implementing this helper can do their own validation/error handling nicely. This is a follow up to e4350bb96648622b73414712588ffc015e193562 --- .../app/components/uppy-backup-uploader.js | 1 + .../app/mixins/composer-upload-uppy.js | 1 + .../discourse/app/mixins/uppy-s3-multipart.js | 24 +- .../discourse/app/mixins/uppy-upload.js | 5 +- app/controllers/admin/backups_controller.rb | 22 ++ app/controllers/uploads_controller.rb | 366 ++---------------- config/routes.rb | 6 + lib/external_upload_helpers.rb | 347 +++++++++++++++++ .../requests/admin/backups_controller_spec.rb | 116 ++++++ spec/requests/uploads_controller_spec.rb | 92 +---- 10 files changed, 541 insertions(+), 439 deletions(-) create mode 100644 lib/external_upload_helpers.rb diff --git a/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js b/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js index 5891106f90..55be0926b7 100644 --- a/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js +++ b/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js @@ -7,6 +7,7 @@ export default Component.extend(UppyUploadMixin, { tagName: "span", type: "backup", useMultipartUploadsIfAvailable: true, + uploadRootPath: "/admin/backups", @discourseComputed("uploading", "uploadProgress") uploadButtonText(uploading, progress) { diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js index 5146583d40..b31587a702 100644 --- a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js +++ b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js @@ -33,6 +33,7 @@ import bootbox from "bootbox"; // functionality and event binding. // export default Mixin.create(ExtendableUploader, UppyS3Multipart, { + uploadRootPath: "/uploads", uploadTargetBound: false, @observes("composerModel.uploadCancelled") diff --git a/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js b/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js index 6253234297..2c4d72bedd 100644 --- a/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js +++ b/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js @@ -1,4 +1,5 @@ import Mixin from "@ember/object/mixin"; +import getUrl from "discourse-common/lib/get-url"; import { bind } from "discourse-common/utils/decorators"; import { Promise } from "rsvp"; import { ajax } from "discourse/lib/ajax"; @@ -50,7 +51,7 @@ export default Mixin.create({ data.metadata = { "sha1-checksum": file.meta.sha1_checksum }; } - return ajax("/uploads/create-multipart.json", { + return ajax(getUrl(`${this.uploadRootPath}/create-multipart.json`), { type: "POST", data, // uppy is inconsistent, an error here fires the upload-error event @@ -70,13 +71,16 @@ export default Mixin.create({ if (file.preparePartsRetryAttempts === undefined) { file.preparePartsRetryAttempts = 0; } - return ajax("/uploads/batch-presign-multipart-parts.json", { - type: "POST", - data: { - part_numbers: partData.partNumbers, - unique_identifier: file.meta.unique_identifier, - }, - }) + return ajax( + getUrl(`${this.uploadRootPath}/batch-presign-multipart-parts.json`), + { + type: "POST", + data: { + part_numbers: partData.partNumbers, + unique_identifier: file.meta.unique_identifier, + }, + } + ) .then((data) => { if (file.preparePartsRetryAttempts) { delete file.preparePartsRetryAttempts; @@ -122,7 +126,7 @@ export default Mixin.create({ const parts = data.parts.map((part) => { return { part_number: part.PartNumber, etag: part.ETag }; }); - return ajax("/uploads/complete-multipart.json", { + return ajax(getUrl(`${this.uploadRootPath}/complete-multipart.json`), { type: "POST", contentType: "application/json", data: JSON.stringify({ @@ -155,7 +159,7 @@ export default Mixin.create({ return; } - return ajax("/uploads/abort-multipart.json", { + return ajax(getUrl(`${this.uploadRootPath}/abort-multipart.json`), { type: "POST", data: { external_upload_identifier: uploadId, diff --git a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js index cabcfc2ae4..f94ca0b40e 100644 --- a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js +++ b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js @@ -27,6 +27,7 @@ export default Mixin.create(UppyS3Multipart, { autoStartUploads: true, _inProgressUploads: 0, id: null, + uploadRootPath: "/uploads", uploadDone() { warn("You should implement `uploadDone`", { @@ -223,7 +224,7 @@ export default Mixin.create(UppyS3Multipart, { data.metadata = { "sha1-checksum": file.meta.sha1_checksum }; } - return ajax(getUrl("/uploads/generate-presigned-put"), { + return ajax(getUrl(`${this.uploadRootPath}/generate-presigned-put`), { type: "POST", data, }) @@ -277,7 +278,7 @@ export default Mixin.create(UppyS3Multipart, { }, _completeExternalUpload(file) { - return ajax(getUrl("/uploads/complete-external-upload"), { + return ajax(getUrl(`${this.uploadRootPath}/complete-external-upload`), { type: "POST", data: deepMerge( { unique_identifier: file.meta.uniqueUploadIdentifier }, diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb index 0ea55fe150..188db1fdcc 100644 --- a/app/controllers/admin/backups_controller.rb +++ b/app/controllers/admin/backups_controller.rb @@ -4,6 +4,8 @@ require "backup_restore" require "backup_restore/backup_store" class Admin::BackupsController < Admin::AdminController + include ExternalUploadHelpers + before_action :ensure_backups_enabled skip_before_action :check_xhr, only: [:index, :show, :logs, :check_backup_chunk, :upload_backup_chunk] @@ -234,4 +236,24 @@ class Admin::BackupsController < Admin::AdminController def render_error(message_key) render json: failed_json.merge(message: I18n.t(message_key)) end + + def validate_before_create_multipart(file_name:, file_size:, upload_type:) + raise ExternalUploadHelpers::ExternalUploadValidationError.new(I18n.t("backup.backup_file_should_be_tar_gz")) unless valid_extension?(file_name) + raise ExternalUploadHelpers::ExternalUploadValidationError.new(I18n.t("backup.invalid_filename")) unless valid_filename?(file_name) + end + + def self.serialize_upload(_upload) + {} # noop, the backup does not create an upload record + end + + def create_direct_multipart_upload + begin + yield + rescue BackupRestore::BackupStore::StorageError => err + message = debug_upload_error(err, I18n.t("upload.create_multipart_failure", additional_detail: err.message)) + raise ExternalUploadHelpers::ExternalUploadValidationError.new(message) + rescue BackupRestore::BackupStore::BackupFileExists + raise ExternalUploadHelpers::ExternalUploadValidationError.new(I18n.t("backup.file_exists")) + end + end end diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index c2ea7a175f..f84a0ebd0a 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -3,36 +3,17 @@ require "mini_mime" class UploadsController < ApplicationController + include ExternalUploadHelpers + requires_login except: [:show, :show_short, :show_secure] skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show, :show_short, :show_secure] protect_from_forgery except: :show before_action :is_asset_path, :apply_cdn_headers, only: [:show, :show_short, :show_secure] - before_action :external_store_check, only: [ - :show_secure, - :generate_presigned_put, - :complete_external_upload, - :create_multipart, - :batch_presign_multipart_parts, - :abort_multipart, - :complete_multipart - ] - before_action :direct_s3_uploads_check, only: [ - :generate_presigned_put, - :complete_external_upload, - :create_multipart, - :batch_presign_multipart_parts, - :abort_multipart, - :complete_multipart - ] - before_action :can_upload_external?, only: [:create_multipart, :generate_presigned_put] + before_action :external_store_check, only: [:show_secure] SECURE_REDIRECT_GRACE_SECONDS = 5 - PRESIGNED_PUT_RATE_LIMIT_PER_MINUTE = 10 - CREATE_MULTIPART_RATE_LIMIT_PER_MINUTE = 10 - COMPLETE_MULTIPART_RATE_LIMIT_PER_MINUTE = 10 - BATCH_PRESIGN_RATE_LIMIT_PER_MINUTE = 10 def create # capture current user for block later on @@ -208,285 +189,25 @@ class UploadsController < ApplicationController } end - def generate_presigned_put - RateLimiter.new( - current_user, "generate-presigned-put-upload-stub", PRESIGNED_PUT_RATE_LIMIT_PER_MINUTE, 1.minute - ).performed! - - file_name = params.require(:file_name) - file_size = params.require(:file_size).to_i - type = params.require(:type) - - if file_size_too_big?(file_name, file_size) - return render_json_error( - I18n.t("upload.attachments.too_large_humanized", max_size: ActiveSupport::NumberHelper.number_to_human_size(SiteSetting.max_attachment_size_kb.kilobytes)), - status: 422 - ) - end - - external_upload_data = ExternalUploadManager.create_direct_upload( - current_user: current_user, - file_name: file_name, - file_size: file_size, - upload_type: type, - metadata: parse_allowed_metadata(params[:metadata]) - ) - - render json: external_upload_data - end - - def complete_external_upload - unique_identifier = params.require(:unique_identifier) - external_upload_stub = ExternalUploadStub.find_by( - unique_identifier: unique_identifier, created_by: current_user - ) - return render_404 if external_upload_stub.blank? - - complete_external_upload_via_manager(external_upload_stub) - end - - def complete_external_upload_via_manager(external_upload_stub) - opts = { - for_private_message: params[:for_private_message]&.to_s == "true", - for_site_setting: params[:for_site_setting]&.to_s == "true", - pasted: params[:pasted]&.to_s == "true", - } - - external_upload_manager = ExternalUploadManager.new(external_upload_stub, opts) - hijack do - begin - upload = external_upload_manager.transform! - - if upload.errors.empty? - response_serialized = external_upload_stub.upload_type != "backup" ? UploadsController.serialize_upload(upload) : {} - external_upload_stub.destroy! - render json: response_serialized, status: 200 - else - render_json_error(upload.errors.to_hash.values.flatten, status: 422) - end - rescue ExternalUploadManager::SizeMismatchError => err - render_json_error( - debug_upload_error(err, "upload.size_mismatch_failure", additional_detail: err.message), - status: 422 - ) - rescue ExternalUploadManager::ChecksumMismatchError => err - render_json_error( - debug_upload_error(err, "upload.checksum_mismatch_failure", additional_detail: err.message), - status: 422 - ) - rescue ExternalUploadManager::CannotPromoteError => err - render_json_error( - debug_upload_error(err, "upload.cannot_promote_failure", additional_detail: err.message), - status: 422 - ) - rescue ExternalUploadManager::DownloadFailedError, Aws::S3::Errors::NotFound => err - render_json_error( - debug_upload_error(err, "upload.download_failure", additional_detail: err.message), - status: 422 - ) - rescue => err - Discourse.warn_exception( - err, message: "Complete external upload failed unexpectedly for user #{current_user.id}" - ) - - render_json_error(I18n.t("upload.failed"), status: 422) - end - end - end - - def create_multipart - RateLimiter.new( - current_user, "create-multipart-upload", CREATE_MULTIPART_RATE_LIMIT_PER_MINUTE, 1.minute - ).performed! - - file_name = params.require(:file_name) - file_size = params.require(:file_size).to_i - upload_type = params.require(:upload_type) - - if upload_type == "backup" - ensure_staff - return render_json_error(I18n.t("backup.backup_file_should_be_tar_gz")) unless valid_backup_extension?(file_name) - return render_json_error(I18n.t("backup.invalid_filename")) unless valid_backup_filename?(file_name) - else - if file_size_too_big?(file_name, file_size) - return render_json_error( - I18n.t("upload.attachments.too_large_humanized", max_size: ActiveSupport::NumberHelper.number_to_human_size(SiteSetting.max_attachment_size_kb.kilobytes)), - status: 422 - ) - end - end - - begin - external_upload_data = ExternalUploadManager.create_direct_multipart_upload( - current_user: current_user, - file_name: file_name, - file_size: file_size, - upload_type: upload_type, - metadata: parse_allowed_metadata(params[:metadata]) - ) - rescue Aws::S3::Errors::ServiceError => err - return render_json_error( - debug_upload_error(err, "upload.create_multipart_failure", additional_detail: err.message), - status: 422 - ) - rescue BackupRestore::BackupStore::BackupFileExists - return render_json_error(I18n.t("backup.file_exists"), status: 422) - rescue BackupRestore::BackupStore::StorageError => err - return render_json_error( - debug_upload_error(err, "upload.create_multipart_failure", additional_detail: err.message), - status: 422 - ) - end - - render json: external_upload_data - end - - def batch_presign_multipart_parts - part_numbers = params.require(:part_numbers) - unique_identifier = params.require(:unique_identifier) - - RateLimiter.new( - current_user, "batch-presign", BATCH_PRESIGN_RATE_LIMIT_PER_MINUTE, 1.minute - ).performed! - - part_numbers = part_numbers.map do |part_number| - validate_part_number(part_number) - end - - external_upload_stub = ExternalUploadStub.find_by( - unique_identifier: unique_identifier, created_by: current_user - ) - return render_404 if external_upload_stub.blank? - - if !multipart_upload_exists?(external_upload_stub) - return render_404 - end - - store = multipart_store(external_upload_stub.upload_type) - - presigned_urls = {} - part_numbers.each do |part_number| - presigned_urls[part_number] = store.presign_multipart_part( - upload_id: external_upload_stub.external_upload_identifier, - key: external_upload_stub.key, - part_number: part_number - ) - end - - render json: { presigned_urls: presigned_urls } - end - - def validate_part_number(part_number) - part_number = part_number.to_i - if !part_number.between?(1, 10000) - raise Discourse::InvalidParameters.new( - "Each part number should be between 1 and 10000" - ) - end - part_number - end - - def multipart_upload_exists?(external_upload_stub) - store = multipart_store(external_upload_stub.upload_type) - begin - store.list_multipart_parts( - upload_id: external_upload_stub.external_upload_identifier, - key: external_upload_stub.key, - max_parts: 1 - ) - rescue Aws::S3::Errors::NoSuchUpload => err - debug_upload_error(err, "upload.external_upload_not_found", { additional_detail: "path: #{external_upload_stub.key}" }) - return false - end - true - end - - def abort_multipart - external_upload_identifier = params.require(:external_upload_identifier) - external_upload_stub = ExternalUploadStub.find_by( - external_upload_identifier: external_upload_identifier - ) - - # The stub could have already been deleted by an earlier error via - # ExternalUploadManager, so we consider this a great success if the - # stub is already gone. - return render json: success_json if external_upload_stub.blank? - - return render_404 if external_upload_stub.created_by_id != current_user.id - store = multipart_store(external_upload_stub.upload_type) - - begin - store.abort_multipart( - upload_id: external_upload_stub.external_upload_identifier, - key: external_upload_stub.key - ) - rescue Aws::S3::Errors::ServiceError => err - return render_json_error( - debug_upload_error(err, "upload.abort_multipart_failure", additional_detail: "external upload stub id: #{external_upload_stub.id}"), - status: 422 - ) - end - - external_upload_stub.destroy! - - render json: success_json - end - - def complete_multipart - unique_identifier = params.require(:unique_identifier) - parts = params.require(:parts) - - RateLimiter.new( - current_user, "complete-multipart-upload", COMPLETE_MULTIPART_RATE_LIMIT_PER_MINUTE, 1.minute - ).performed! - - external_upload_stub = ExternalUploadStub.find_by( - unique_identifier: unique_identifier, created_by: current_user - ) - return render_404 if external_upload_stub.blank? - - if !multipart_upload_exists?(external_upload_stub) - return render_404 - end - - store = multipart_store(external_upload_stub.upload_type) - parts = parts.map do |part| - part_number = part[:part_number] - etag = part[:etag] - part_number = validate_part_number(part_number) - - if etag.blank? - raise Discourse::InvalidParameters.new("All parts must have an etag and a valid part number") - end - - # this is done so it's an array of hashes rather than an array of - # ActionController::Parameters - { part_number: part_number, etag: etag } - end.sort_by do |part| - part[:part_number] - end - - begin - complete_response = store.complete_multipart( - upload_id: external_upload_stub.external_upload_identifier, - key: external_upload_stub.key, - parts: parts - ) - rescue Aws::S3::Errors::ServiceError => err - return render_json_error( - debug_upload_error(err, "upload.complete_multipart_failure", additional_detail: "external upload stub id: #{external_upload_stub.id}"), - status: 422 - ) - end - - complete_external_upload_via_manager(external_upload_stub) - end - protected - def multipart_store(upload_type) - ensure_staff if upload_type == "backup" - ExternalUploadManager.store_for_upload_type(upload_type) + def validate_before_create_multipart(file_name:, file_size:, upload_type:) + validate_file_size(file_name: file_name, file_size: file_size) + end + + def validate_before_create_direct_upload(file_name:, file_size:, upload_type:) + validate_file_size(file_name: file_name, file_size: file_size) + end + + def validate_file_size(file_name:, file_size:) + if file_size_too_big?(file_name, file_size) + raise ExternalUploadValidationError.new( + I18n.t( + "upload.attachments.too_large_humanized", + max_size: ActiveSupport::NumberHelper.number_to_human_size(SiteSetting.max_attachment_size_kb.kilobytes) + ) + ) + end end def force_download? @@ -497,10 +218,6 @@ class UploadsController < ApplicationController raise Discourse::InvalidParameters.new("XHR not allowed") end - def render_404 - raise Discourse::NotFound - end - def self.serialize_upload(data) # as_json.as_json is not a typo... as_json in AM serializer returns keys as symbols, we need them # as strings here @@ -556,18 +273,6 @@ class UploadsController < ApplicationController private - def external_store_check - return render_404 if !Discourse.store.external? - end - - def direct_s3_uploads_check - return render_404 if !SiteSetting.enable_direct_s3_uploads - end - - def can_upload_external? - raise Discourse::InvalidAccess if !guardian.can_upload_external? - end - # We can pre-emptively check size for attachments, but not for images # as they may be further reduced in size by UploadCreator (at this point # they may have already been reduced in size by preprocessors) @@ -593,29 +298,12 @@ class UploadsController < ApplicationController send_file(file_path, opts) end - def debug_upload_error(err, translation_key, translation_params = {}) - return if !SiteSetting.enable_upload_debug_mode - message = I18n.t(translation_key, translation_params) - Discourse.warn_exception(err, message: message) - Rails.env.development? ? message : I18n.t("upload.failed") - end - - # don't want people posting arbitrary S3 metadata so we just take the - # one we need. all of these will be converted to x-amz-meta- metadata - # fields in S3 so it's best to use dashes in the names for consistency - # - # this metadata is baked into the presigned url and is not altered when - # sending the PUT from the clientside to the presigned url - def parse_allowed_metadata(metadata) - return if metadata.blank? - metadata.permit("sha1-checksum").to_h - end - - def valid_backup_extension?(filename) - /\.(tar\.gz|t?gz)$/i =~ filename - end - - def valid_backup_filename?(filename) - !!(/^[a-zA-Z0-9\._\-]+$/ =~ filename) + def create_direct_multipart_upload + begin + yield + rescue Aws::S3::Errors::ServiceError => err + message = debug_upload_error(err, I18n.t("upload.create_multipart_failure", additional_detail: err.message)) + raise ExternalUploadHelpers::ExternalUploadValidationError.new(message) + end end end diff --git a/config/routes.rb b/config/routes.rb index 1c52c52961..943a773fff 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -304,6 +304,12 @@ Discourse::Application.routes.draw do post "restore" => "backups#restore", constraints: { id: RouteFormat.backup } end collection do + # multipart uploads + post "create-multipart" => "backups#create_multipart", format: :json + post "complete-multipart" => "backups#complete_multipart", format: :json + post "abort-multipart" => "backups#abort_multipart", format: :json + post "batch-presign-multipart-parts" => "backups#batch_presign_multipart_parts", format: :json + get "logs" => "backups#logs" get "status" => "backups#status" delete "cancel" => "backups#cancel" diff --git a/lib/external_upload_helpers.rb b/lib/external_upload_helpers.rb new file mode 100644 index 0000000000..ff187e5de3 --- /dev/null +++ b/lib/external_upload_helpers.rb @@ -0,0 +1,347 @@ +# frozen_string_literal: true + +# Extends controllers with the methods required to do direct +# external uploads. +module ExternalUploadHelpers + extend ActiveSupport::Concern + + class ExternalUploadValidationError < StandardError; end + + PRESIGNED_PUT_RATE_LIMIT_PER_MINUTE = 10 + CREATE_MULTIPART_RATE_LIMIT_PER_MINUTE = 10 + COMPLETE_MULTIPART_RATE_LIMIT_PER_MINUTE = 10 + BATCH_PRESIGN_RATE_LIMIT_PER_MINUTE = 10 + + included do + before_action :external_store_check, only: [ + :generate_presigned_put, + :complete_external_upload, + :create_multipart, + :batch_presign_multipart_parts, + :abort_multipart, + :complete_multipart + ] + before_action :direct_s3_uploads_check, only: [ + :generate_presigned_put, + :complete_external_upload, + :create_multipart, + :batch_presign_multipart_parts, + :abort_multipart, + :complete_multipart + ] + before_action :can_upload_external?, only: [:create_multipart, :generate_presigned_put] + end + + def generate_presigned_put + RateLimiter.new( + current_user, "generate-presigned-put-upload-stub", ExternalUploadHelpers::PRESIGNED_PUT_RATE_LIMIT_PER_MINUTE, 1.minute + ).performed! + + file_name = params.require(:file_name) + file_size = params.require(:file_size).to_i + type = params.require(:type) + + begin + validate_before_create_direct_upload( + file_name: file_name, + file_size: file_size, + upload_type: type + ) + rescue ExternalUploadValidationError => err + return render_json_error(err.message, status: 422) + end + + external_upload_data = ExternalUploadManager.create_direct_upload( + current_user: current_user, + file_name: file_name, + file_size: file_size, + upload_type: type, + metadata: parse_allowed_metadata(params[:metadata]) + ) + + render json: external_upload_data + end + + def complete_external_upload + unique_identifier = params.require(:unique_identifier) + external_upload_stub = ExternalUploadStub.find_by( + unique_identifier: unique_identifier, created_by: current_user + ) + return render_404 if external_upload_stub.blank? + + complete_external_upload_via_manager(external_upload_stub) + end + + def create_multipart + RateLimiter.new( + current_user, "create-multipart-upload", ExternalUploadHelpers::CREATE_MULTIPART_RATE_LIMIT_PER_MINUTE, 1.minute + ).performed! + + file_name = params.require(:file_name) + file_size = params.require(:file_size).to_i + upload_type = params.require(:upload_type) + + begin + validate_before_create_multipart( + file_name: file_name, + file_size: file_size, + upload_type: upload_type + ) + rescue ExternalUploadValidationError => err + return render_json_error(err.message, status: 422) + end + + begin + external_upload_data = create_direct_multipart_upload do + ExternalUploadManager.create_direct_multipart_upload( + current_user: current_user, + file_name: file_name, + file_size: file_size, + upload_type: upload_type, + metadata: parse_allowed_metadata(params[:metadata]) + ) + end + rescue ExternalUploadHelpers::ExternalUploadValidationError => err + return render_json_error(err.message, status: 422) + end + + render json: external_upload_data + end + + def batch_presign_multipart_parts + part_numbers = params.require(:part_numbers) + unique_identifier = params.require(:unique_identifier) + + RateLimiter.new( + current_user, "batch-presign", ExternalUploadHelpers::BATCH_PRESIGN_RATE_LIMIT_PER_MINUTE, 1.minute + ).performed! + + part_numbers = part_numbers.map do |part_number| + validate_part_number(part_number) + end + + external_upload_stub = ExternalUploadStub.find_by( + unique_identifier: unique_identifier, created_by: current_user + ) + return render_404 if external_upload_stub.blank? + + if !multipart_upload_exists?(external_upload_stub) + return render_404 + end + + store = multipart_store(external_upload_stub.upload_type) + + presigned_urls = {} + part_numbers.each do |part_number| + presigned_urls[part_number] = store.presign_multipart_part( + upload_id: external_upload_stub.external_upload_identifier, + key: external_upload_stub.key, + part_number: part_number + ) + end + + render json: { presigned_urls: presigned_urls } + end + + def multipart_upload_exists?(external_upload_stub) + store = multipart_store(external_upload_stub.upload_type) + begin + store.list_multipart_parts( + upload_id: external_upload_stub.external_upload_identifier, + key: external_upload_stub.key, + max_parts: 1 + ) + rescue Aws::S3::Errors::NoSuchUpload => err + debug_upload_error(err, I18n.t("upload.external_upload_not_found", additional_detail: "path: #{external_upload_stub.key}")) + return false + end + true + end + + def abort_multipart + external_upload_identifier = params.require(:external_upload_identifier) + external_upload_stub = ExternalUploadStub.find_by( + external_upload_identifier: external_upload_identifier + ) + + # The stub could have already been deleted by an earlier error via + # ExternalUploadManager, so we consider this a great success if the + # stub is already gone. + return render json: success_json if external_upload_stub.blank? + + return render_404 if external_upload_stub.created_by_id != current_user.id + store = multipart_store(external_upload_stub.upload_type) + + begin + store.abort_multipart( + upload_id: external_upload_stub.external_upload_identifier, + key: external_upload_stub.key + ) + rescue Aws::S3::Errors::ServiceError => err + return render_json_error( + debug_upload_error(err, I18n.t("upload.abort_multipart_failure", additional_detail: "external upload stub id: #{external_upload_stub.id}")), + status: 422 + ) + end + + external_upload_stub.destroy! + + render json: success_json + end + + def complete_multipart + unique_identifier = params.require(:unique_identifier) + parts = params.require(:parts) + + RateLimiter.new( + current_user, "complete-multipart-upload", ExternalUploadHelpers::COMPLETE_MULTIPART_RATE_LIMIT_PER_MINUTE, 1.minute + ).performed! + + external_upload_stub = ExternalUploadStub.find_by( + unique_identifier: unique_identifier, created_by: current_user + ) + return render_404 if external_upload_stub.blank? + + if !multipart_upload_exists?(external_upload_stub) + return render_404 + end + + store = multipart_store(external_upload_stub.upload_type) + parts = parts.map do |part| + part_number = part[:part_number] + etag = part[:etag] + part_number = validate_part_number(part_number) + + if etag.blank? + raise Discourse::InvalidParameters.new("All parts must have an etag and a valid part number") + end + + # this is done so it's an array of hashes rather than an array of + # ActionController::Parameters + { part_number: part_number, etag: etag } + end.sort_by do |part| + part[:part_number] + end + + begin + complete_response = store.complete_multipart( + upload_id: external_upload_stub.external_upload_identifier, + key: external_upload_stub.key, + parts: parts + ) + rescue Aws::S3::Errors::ServiceError => err + return render_json_error( + debug_upload_error(err, I18n.t("upload.complete_multipart_failure", additional_detail: "external upload stub id: #{external_upload_stub.id}")), + status: 422 + ) + end + + complete_external_upload_via_manager(external_upload_stub) + end + + private + + def complete_external_upload_via_manager(external_upload_stub) + opts = { + for_private_message: params[:for_private_message]&.to_s == "true", + for_site_setting: params[:for_site_setting]&.to_s == "true", + pasted: params[:pasted]&.to_s == "true", + } + + external_upload_manager = ExternalUploadManager.new(external_upload_stub, opts) + hijack do + begin + upload = external_upload_manager.transform! + + if upload.errors.empty? + response_serialized = self.class.serialize_upload(upload) + external_upload_stub.destroy! + render json: response_serialized, status: 200 + else + render_json_error(upload.errors.to_hash.values.flatten, status: 422) + end + rescue ExternalUploadManager::SizeMismatchError => err + render_json_error( + debug_upload_error(err, I18n.t("upload.size_mismatch_failure", additional_detail: err.message)), + status: 422 + ) + rescue ExternalUploadManager::ChecksumMismatchError => err + render_json_error( + debug_upload_error(err, I18n.t("upload.checksum_mismatch_failure", additional_detail: err.message)), + status: 422 + ) + rescue ExternalUploadManager::CannotPromoteError => err + render_json_error( + debug_upload_error(err, I18n.t("upload.cannot_promote_failure", additional_detail: err.message)), + status: 422 + ) + rescue ExternalUploadManager::DownloadFailedError, Aws::S3::Errors::NotFound => err + render_json_error( + debug_upload_error(err, I18n.t("upload.download_failure", additional_detail: err.message)), + status: 422 + ) + rescue => err + Discourse.warn_exception( + err, message: "Complete external upload failed unexpectedly for user #{current_user.id}" + ) + + render_json_error(I18n.t("upload.failed"), status: 422) + end + end + end + + def validate_before_create_direct_upload(file_name:, file_size:, upload_type:) + # noop, should be overridden + end + + def validate_before_create_multipart(file_name:, file_size:, upload_type:) + # noop, should be overridden + end + + def validate_part_number(part_number) + part_number = part_number.to_i + if !part_number.between?(1, 10000) + raise Discourse::InvalidParameters.new( + "Each part number should be between 1 and 10000" + ) + end + part_number + end + + def debug_upload_error(err, friendly_message) + return if !SiteSetting.enable_upload_debug_mode + Discourse.warn_exception(err, message: friendly_message) + Rails.env.development? ? friendly_message : I18n.t("upload.failed") + end + + def multipart_store(upload_type) + ExternalUploadManager.store_for_upload_type(upload_type) + end + + def external_store_check + return render_404 if !Discourse.store.external? + end + + def direct_s3_uploads_check + return render_404 if !SiteSetting.enable_direct_s3_uploads + end + + def can_upload_external? + raise Discourse::InvalidAccess if !guardian.can_upload_external? + end + + # don't want people posting arbitrary S3 metadata so we just take the + # one we need. all of these will be converted to x-amz-meta- metadata + # fields in S3 so it's best to use dashes in the names for consistency + # + # this metadata is baked into the presigned url and is not altered when + # sending the PUT from the clientside to the presigned url + def parse_allowed_metadata(metadata) + return if metadata.blank? + metadata.permit("sha1-checksum").to_h + end + + def render_404 + raise Discourse::NotFound + end +end diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb index fa72233a59..6e3c06ec49 100644 --- a/spec/requests/admin/backups_controller_spec.rb +++ b/spec/requests/admin/backups_controller_spec.rb @@ -416,4 +416,120 @@ RSpec.describe Admin::BackupsController do expect(response).to be_not_found end end + + describe "S3 multipart uploads" do + let(:upload_type) { "backup" } + let(:test_bucket_prefix) { "test_#{ENV['TEST_ENV_NUMBER'].presence || '0'}" } + let(:backup_file_exists_response) { { status: 404 } } + let(:mock_multipart_upload_id) { "ibZBv_75gd9r8lH_gqXatLdxMVpAlj6CFTR.OwyF3953YdwbcQnMA2BLGn8Lx12fQNICtMw5KyteFeHw.Sjng--" } + + before do + setup_s3 + SiteSetting.enable_direct_s3_uploads = true + SiteSetting.s3_backup_bucket = "s3-backup-bucket" + SiteSetting.backup_location = BackupLocationSiteSetting::S3 + stub_request(:head, "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/").to_return(status: 200, body: "", headers: {}) + stub_request(:head, "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/default/test.tar.gz").to_return( + backup_file_exists_response + ) + end + + context "when the user is not admin" do + before do + admin.update(admin: false) + end + + it "errors with invalid access error" do + post "/admin/backups/create-multipart.json", params: { + file_name: "test.tar.gz", + upload_type: upload_type, + file_size: 4098 + } + expect(response.status).to eq(404) + end + end + + context "when the user is admin" do + def stub_create_multipart_backup_request + BackupRestore::S3BackupStore.any_instance.stubs(:temporary_upload_path).returns( + "temp/default/#{test_bucket_prefix}/28fccf8259bbe75b873a2bd2564b778c/2u98j832nx93272x947823.gz" + ) + create_multipart_result = <<~BODY + \n + + s3-backup-bucket + temp/default/#{test_bucket_prefix}/28fccf8259bbe75b873a2bd2564b778c/2u98j832nx93272x947823.gz + #{mock_multipart_upload_id} + + BODY + stub_request(:post, "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/temp/default/#{test_bucket_prefix}/28fccf8259bbe75b873a2bd2564b778c/2u98j832nx93272x947823.gz?uploads"). + to_return(status: 200, body: create_multipart_result) + end + + it "creates the multipart upload" do + stub_create_multipart_backup_request + post "/admin/backups/create-multipart.json", params: { + file_name: "test.tar.gz", + upload_type: upload_type, + file_size: 4098 + } + expect(response.status).to eq(200) + result = response.parsed_body + + external_upload_stub = ExternalUploadStub.where( + unique_identifier: result["unique_identifier"], + original_filename: "test.tar.gz", + created_by: admin, + upload_type: upload_type, + key: result["key"], + multipart: true + ) + expect(external_upload_stub.exists?).to eq(true) + end + + context "when backup of same filename already exists" do + let(:backup_file_exists_response) { { status: 200, body: "" } } + + it "throws an error" do + post "/admin/backups/create-multipart.json", params: { + file_name: "test.tar.gz", + upload_type: upload_type, + file_size: 4098 + } + expect(response.status).to eq(422) + expect(response.parsed_body["errors"]).to include( + I18n.t("backup.file_exists") + ) + end + end + + context "when filename is invalid" do + it "throws an error" do + post "/admin/backups/create-multipart.json", params: { + file_name: "blah $$##.tar.gz", + upload_type: upload_type, + file_size: 4098 + } + expect(response.status).to eq(422) + expect(response.parsed_body["errors"]).to include( + I18n.t("backup.invalid_filename") + ) + end + end + + context "when extension is invalid" do + it "throws an error" do + post "/admin/backups/create-multipart.json", params: { + file_name: "test.png", + upload_type: upload_type, + file_size: 4098 + } + expect(response.status).to eq(422) + expect(response.parsed_body["errors"]).to include( + I18n.t("backup.backup_file_should_be_tar_gz") + ) + end + end + end + end end diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb index 85d7df04da..4043c018c8 100644 --- a/spec/requests/uploads_controller_spec.rb +++ b/spec/requests/uploads_controller_spec.rb @@ -764,7 +764,7 @@ describe UploadsController do RateLimiter.enable RateLimiter.clear_all! - stub_const(UploadsController, "PRESIGNED_PUT_RATE_LIMIT_PER_MINUTE", 1) do + stub_const(ExternalUploadHelpers, "PRESIGNED_PUT_RATE_LIMIT_PER_MINUTE", 1) do post "/uploads/generate-presigned-put.json", params: { file_name: "test.png", type: "card_background", file_size: 1024 } post "/uploads/generate-presigned-put.json", params: { file_name: "test.png", type: "card_background", file_size: 1024 } end @@ -793,8 +793,6 @@ describe UploadsController do sign_in(user) SiteSetting.enable_direct_s3_uploads = true setup_s3 - SiteSetting.s3_backup_bucket = "s3-backup-bucket" - SiteSetting.backup_location = BackupLocationSiteSetting::S3 end it "errors if the correct params are not provided" do @@ -902,7 +900,7 @@ describe UploadsController do RateLimiter.clear_all! stub_create_multipart_request - stub_const(UploadsController, "CREATE_MULTIPART_RATE_LIMIT_PER_MINUTE", 1) do + stub_const(ExternalUploadHelpers, "CREATE_MULTIPART_RATE_LIMIT_PER_MINUTE", 1) do post "/uploads/create-multipart.json", params: { file_name: "test.png", upload_type: "composer", @@ -918,88 +916,6 @@ describe UploadsController do expect(response.status).to eq(429) end end - - context "when the upload_type is backup" do - let(:upload_type) { "backup" } - let(:backup_file_exists_response) { { status: 404 } } - - before do - stub_request(:head, "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/").to_return(status: 200, body: "", headers: {}) - stub_request(:head, "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/default/test.tar.gz").to_return( - backup_file_exists_response - ) - end - - context "when the user is not admin" do - it "errors with invalid access error" do - post "/uploads/create-multipart.json", params: { - file_name: "test.tar.gz", - upload_type: upload_type, - file_size: 4098 - } - expect(response.status).to eq(403) - end - end - - context "when the user is admin" do - before do - user.update(admin: true) - end - - def stub_create_multipart_backup_request - BackupRestore::S3BackupStore.any_instance.stubs(:temporary_upload_path).returns( - "temp/default/#{test_bucket_prefix}/28fccf8259bbe75b873a2bd2564b778c/2u98j832nx93272x947823.gz" - ) - create_multipart_result = <<~BODY - \n - - s3-backup-bucket - temp/default/#{test_bucket_prefix}/28fccf8259bbe75b873a2bd2564b778c/2u98j832nx93272x947823.gz - #{mock_multipart_upload_id} - - BODY - stub_request(:post, "https://s3-backup-bucket.s3.us-west-1.amazonaws.com/temp/default/#{test_bucket_prefix}/28fccf8259bbe75b873a2bd2564b778c/2u98j832nx93272x947823.gz?uploads"). - to_return(status: 200, body: create_multipart_result) - end - - it "creates the multipart upload" do - stub_create_multipart_backup_request - post "/uploads/create-multipart.json", params: { - file_name: "test.tar.gz", - upload_type: upload_type, - file_size: 4098 - } - expect(response.status).to eq(200) - result = response.parsed_body - - external_upload_stub = ExternalUploadStub.where( - unique_identifier: result["unique_identifier"], - original_filename: "test.tar.gz", - created_by: user, - upload_type: upload_type, - key: result["key"], - multipart: true - ) - expect(external_upload_stub.exists?).to eq(true) - end - - context "when backup of same filename already exists" do - let(:backup_file_exists_response) { { status: 200, body: "" } } - - it "throws an error" do - post "/uploads/create-multipart.json", params: { - file_name: "test.tar.gz", - upload_type: upload_type, - file_size: 4098 - } - expect(response.status).to eq(422) - expect(response.parsed_body["errors"]).to include( - I18n.t("backup.file_exists") - ) - end - end - end - end end context "when the store is not external" do @@ -1127,7 +1043,7 @@ describe UploadsController do RateLimiter.enable RateLimiter.clear_all! - stub_const(UploadsController, "BATCH_PRESIGN_RATE_LIMIT_PER_MINUTE", 1) do + stub_const(ExternalUploadHelpers, "BATCH_PRESIGN_RATE_LIMIT_PER_MINUTE", 1) do stub_list_multipart_request post "/uploads/batch-presign-multipart-parts.json", params: { unique_identifier: external_upload_stub.unique_identifier, @@ -1316,7 +1232,7 @@ describe UploadsController do RateLimiter.enable RateLimiter.clear_all! - stub_const(UploadsController, "COMPLETE_MULTIPART_RATE_LIMIT_PER_MINUTE", 1) do + stub_const(ExternalUploadHelpers, "COMPLETE_MULTIPART_RATE_LIMIT_PER_MINUTE", 1) do post "/uploads/complete-multipart.json", params: { unique_identifier: "blah", parts: [{ part_number: 1, etag: "test1" }, { part_number: 2, etag: "test2" }] From eb82849ccbe2808d06fcc80bfce1f868cdf0ec8b Mon Sep 17 00:00:00 2001 From: Krzysztof Kotlarek Date: Thu, 18 Nov 2021 10:21:34 +1100 Subject: [PATCH 006/168] FIX: none and all categories filter (#14999) parentCategory is passed to drop-category componen: https://github.com/discourse/discourse/blob/main/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs#L11 However, it is not available if it is not explicitly allow listed in selectKitOptions --- .../javascripts/select-kit/addon/components/category-drop.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/select-kit/addon/components/category-drop.js b/app/assets/javascripts/select-kit/addon/components/category-drop.js index 7723bdc2c1..5b19218fd6 100644 --- a/app/assets/javascripts/select-kit/addon/components/category-drop.js +++ b/app/assets/javascripts/select-kit/addon/components/category-drop.js @@ -38,6 +38,7 @@ export default ComboBoxComponent.extend({ autoInsertNoneItem: false, displayCategoryDescription: "displayCategoryDescription", headerComponent: "category-drop/category-drop-header", + parentCategory: false, }, modifyComponentForRow() { From db24c9b94e7301e805ff3ec11562d4666809b0b8 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Thu, 18 Nov 2021 09:19:00 +0800 Subject: [PATCH 007/168] FIX: Incorrect title and chevron when filtering by post number. (#14985) The widget's state did not reflect the state of the controller. --- .../javascripts/discourse/app/widgets/post.js | 16 ++++++++++-- .../discourse/tests/acceptance/topic-test.js | 25 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js index 3f3a0ceadc..0e6a904509 100644 --- a/app/assets/javascripts/discourse/app/widgets/post.js +++ b/app/assets/javascripts/discourse/app/widgets/post.js @@ -388,8 +388,20 @@ createWidget("post-group-request", { createWidget("post-contents", { buildKey: (attrs) => `post-contents-${attrs.id}`, - defaultState() { - return { expandedFirstPost: false, repliesBelow: [] }; + defaultState(attrs) { + const defaultState = { + expandedFirstPost: false, + repliesBelow: [], + }; + + if (this.siteSettings.enable_filtered_replies_view) { + const topicController = this.register.lookup("controller:topic"); + + defaultState.filteredRepliesShown = + topicController.replies_to_post_number === attrs.post_number.toString(); + } + + return defaultState; }, buildClasses(attrs) { diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js index 525695f174..cbe8c5c739 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js @@ -546,3 +546,28 @@ acceptance("Topic last visit line", function (needs) { ); }); }); + +acceptance("Topic filter replies to post number", function (needs) { + needs.settings({ + enable_filtered_replies_view: true, + }); + + test("visit topic", async function (assert) { + await visit("/t/-/280"); + + assert.equal( + query("#post_3 .show-replies").title, + I18n.t("post.filtered_replies_hint", { count: 3 }), + "it displays the right title for filtering by replies" + ); + + await visit("/"); + await visit("/t/-/280?replies_to_post_number=3"); + + assert.equal( + query("#post_3 .show-replies").title, + I18n.t("post.view_all_posts"), + "it displays the right title when filtered by replies" + ); + }); +}); From 20f5474be96504eb94937f4be1ea6339f3fed12f Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Wed, 17 Nov 2021 20:21:12 -0500 Subject: [PATCH 008/168] FEATURE: Log only topic/post search queries in search log (#14994) --- lib/search.rb | 8 +++++++- spec/requests/search_controller_spec.rb | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/search.rb b/lib/search.rb index def3be0fd7..6230955b6a 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -252,7 +252,7 @@ class Search # Query a term def execute(readonly_mode: Discourse.readonly_mode?) - if SiteSetting.log_search_queries? && @opts[:search_type].present? && !readonly_mode + if log_query?(readonly_mode) status, search_log_id = SearchLog.log( term: @term, search_type: @opts[:search_type], @@ -1294,4 +1294,10 @@ class Search end end + def log_query?(readonly_mode) + SiteSetting.log_search_queries? && + @opts[:search_type].present? && + !readonly_mode && + @opts[:type_filter] != "exclude_topics" + end end diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb index be85a71a35..a17f7d3aeb 100644 --- a/spec/requests/search_controller_spec.rb +++ b/spec/requests/search_controller_spec.rb @@ -231,6 +231,13 @@ describe SearchController do expect(SearchLog.where(term: 'wookie')).to be_blank end + it "doesn't log when filtering by exclude_topics" do + SiteSetting.log_search_queries = true + get "/search/query.json", params: { term: 'boop', type_filter: 'exclude_topics' } + expect(response.status).to eq(200) + expect(SearchLog.where(term: 'boop')).to be_blank + end + it "does not raise 500 with an empty term" do get "/search/query.json", params: { term: "in:first", type_filter: "topic", search_for_id: true } expect(response.status).to eq(200) From fc1c76cfccef50ae7bb84ea0d5b7bbdf92f7ee33 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Thu, 18 Nov 2021 13:42:03 +0530 Subject: [PATCH 009/168] FIX: exclude moderator_action post for reply count in user summary. (#14991) Previously, incorrect reply counts are displayed in the "top categories" section of the user summary page since we included the `moderator_action` and `small_action` post types. Co-authored-by: Alan Guo Xiang Tan --- app/models/topic.rb | 5 +++-- app/models/user_summary.rb | 31 ++++++++++++------------------- spec/models/user_summary_spec.rb | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index db9dd21d3c..c9713bef3e 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -392,9 +392,10 @@ class Topic < ActiveRecord::Base end end - def self.visible_post_types(viewed_by = nil) + def self.visible_post_types(viewed_by = nil, include_moderator_actions: true) types = Post.types - result = [types[:regular], types[:moderator_action], types[:small_action]] + result = [types[:regular]] + result += [types[:moderator_action], types[:small_action]] if include_moderator_actions result << types[:whisper] if viewed_by&.staff? result end diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb index 1cd0b02068..f30507117d 100644 --- a/app/models/user_summary.rb +++ b/app/models/user_summary.rb @@ -25,12 +25,7 @@ class UserSummary end def replies - Post - .joins(:topic) - .includes(:topic) - .secured(@guardian) - .merge(Topic.listable_topics.visible.secured(@guardian)) - .where(user: @user) + post_query .where('post_number > 1') .order('posts.like_count DESC, posts.created_at DESC') .limit(MAX_SUMMARY_RESULTS) @@ -88,13 +83,8 @@ class UserSummary def most_replied_to_users replied_users = {} - Post - .joins(:topic) + post_query .joins('JOIN posts replies ON posts.topic_id = replies.topic_id AND posts.reply_to_post_number = replies.post_number') - .includes(:topic) - .secured(@guardian) - .merge(Topic.listable_topics.visible.secured(@guardian)) - .where(user: @user) .where('replies.user_id <> ?', @user.id) .group('replies.user_id') .order('COUNT(*) DESC') @@ -135,13 +125,7 @@ class UserSummary end def top_categories - post_count_query = Post - .joins(:topic) - .includes(:topic) - .secured(@guardian) - .merge(Topic.listable_topics.visible.secured(@guardian)) - .where(user: @user) - .group('topics.category_id') + post_count_query = post_query.group('topics.category_id') top_categories = {} @@ -211,4 +195,13 @@ protected end.compact.sort_by { |u| -u[:count] } end + def post_query + Post + .joins(:topic) + .includes(:topic) + .where('posts.post_type IN (?)', Topic.visible_post_types(@guardian&.user, include_moderator_actions: false)) + .merge(Topic.listable_topics.visible.secured(@guardian)) + .where(user: @user) + end + end diff --git a/spec/models/user_summary_spec.rb b/spec/models/user_summary_spec.rb index 8847fc2a3a..4126632075 100644 --- a/spec/models/user_summary_spec.rb +++ b/spec/models/user_summary_spec.rb @@ -78,4 +78,19 @@ describe UserSummary do expect(summary.top_categories.length).to eq(UserSummary::MAX_SUMMARY_RESULTS) expect(summary.top_categories.first[:id]).to eq(top_category.id) end + + it "excludes moderator action posts" do + topic = create_post.topic + user = topic.user + create_post(user: user, topic: topic) + Fabricate(:small_action, topic: topic, user: user) + + summary = UserSummary.new(user, Guardian.new) + + expect(summary.topics.length).to eq(1) + expect(summary.replies.length).to eq(1) + expect(summary.top_categories.length).to eq(1) + expect(summary.top_categories.first[:topic_count]).to eq(1) + expect(summary.top_categories.first[:post_count]).to eq(1) + end end From 19627eca4ba9f106f8ed074d06b32c00c2ad092a Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 18 Nov 2021 09:46:59 -0500 Subject: [PATCH 010/168] DEV: add outlet for extra categories column (#15002) --- .../app/templates/components/categories-and-latest-topics.hbs | 2 ++ .../app/templates/components/categories-and-top-topics.hbs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs index 29c22f16fa..4b6ffd510d 100644 --- a/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs @@ -5,3 +5,5 @@
{{categories-topic-list topics=topics filter="latest" class="latest-topic-list"}}
+ +{{plugin-outlet name="extra-categories-column" tagName=""}} diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs index ebb4a35781..66cd56ff2e 100644 --- a/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs @@ -5,3 +5,5 @@
{{categories-topic-list topics=topics filter="top" class="top-topic-list"}}
+ +{{plugin-outlet name="extra-categories-column" tagName=""}} From 42fff92d9fe96bd22bcfe435238dfa0c0cde8fef Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 18 Nov 2021 16:51:20 +0100 Subject: [PATCH 011/168] DEV: Make `store` an actual service (#14996) `store:main` was unofficially deprecated 4 years ago in https://github.com/discourse/discourse/commit/fbd5f1e4110059726118a3728141753848d10c19#diff-b19dd1d6a5c7938fda9ae317136bbbb82339946ab457c9b95af936a47276c3ddR22 --- .../javascripts/discourse/app/models/store.js | 388 +----------------- .../javascripts/discourse/app/models/topic.js | 2 +- .../inject-discourse-objects.js | 15 +- .../discourse/app/services/store.js | 384 +++++++++++++++++ .../discourse/tests/helpers/create-store.js | 2 +- .../discourse/tests/helpers/qunit-helpers.js | 2 +- .../discourse/tests/setup-tests.js | 2 +- 7 files changed, 406 insertions(+), 389 deletions(-) create mode 100644 app/assets/javascripts/discourse/app/services/store.js diff --git a/app/assets/javascripts/discourse/app/models/store.js b/app/assets/javascripts/discourse/app/models/store.js index ffac278f1c..ca01224fb8 100644 --- a/app/assets/javascripts/discourse/app/models/store.js +++ b/app/assets/javascripts/discourse/app/models/store.js @@ -1,383 +1,9 @@ -import EmberObject, { set } from "@ember/object"; -import { Promise } from "rsvp"; -import RestModel from "discourse/models/rest"; -import ResultSet from "discourse/models/result-set"; -import { ajax } from "discourse/lib/ajax"; -import { getRegister } from "discourse-common/lib/get-owner"; -import { underscore } from "@ember/string"; +import deprecated from "discourse-common/lib/deprecated"; +export { default, flushMap } from "discourse/services/store"; -let _identityMap; - -// You should only call this if you're a test scaffold -function flushMap() { - _identityMap = {}; -} - -function storeMap(type, id, obj) { - if (!id) { - return; +deprecated( + `"discourse/models/store" import is deprecated, use "discourse/services/store" instead`, + { + since: "2.8.0.beta8", } - - _identityMap[type] = _identityMap[type] || {}; - _identityMap[type][id] = obj; -} - -function fromMap(type, id) { - const byType = _identityMap[type]; - if (byType && byType.hasOwnProperty(id)) { - return byType[id]; - } -} - -function removeMap(type, id) { - const byType = _identityMap[type]; - if (byType && byType.hasOwnProperty(id)) { - delete byType[id]; - } -} - -function findAndRemoveMap(type, id) { - const byType = _identityMap[type]; - if (byType && byType.hasOwnProperty(id)) { - const result = byType[id]; - delete byType[id]; - return result; - } -} - -flushMap(); - -export default EmberObject.extend({ - _plurals: { - category: "categories", - "post-reply": "post-replies", - "post-reply-history": "post_reply_histories", - reviewable_history: "reviewable_histories", - }, - - init() { - this._super(...arguments); - this.register = this.register || getRegister(this); - }, - - pluralize(thing) { - return this._plurals[thing] || thing + "s"; - }, - - addPluralization(thing, plural) { - this._plurals[thing] = plural; - }, - - findAll(type, findArgs) { - const adapter = this.adapterFor(type); - - let store = this; - return adapter.findAll(this, type, findArgs).then((result) => { - let results = this._resultSet(type, result); - if (adapter.afterFindAll) { - results = adapter.afterFindAll(results, { - lookup(subType, id) { - return store._lookupSubType(subType, type, id, result); - }, - }); - } - return results; - }); - }, - - // Mostly for legacy, things like TopicList without ResultSets - findFiltered(type, findArgs) { - return this.adapterFor(type) - .find(this, type, findArgs) - .then((result) => this._build(type, result)); - }, - - _hydrateFindResults(result, type, findArgs) { - if (typeof findArgs === "object") { - return this._resultSet(type, result, findArgs); - } else { - const apiName = this.adapterFor(type).apiNameFor(type); - return this._hydrate(type, result[underscore(apiName)], result); - } - }, - - // See if the store can find stale data. We sometimes prefer to show stale data and - // refresh it in the background. - findStale(type, findArgs, opts) { - const stale = this.adapterFor(type).findStale(this, type, findArgs, opts); - return { - hasResults: stale !== undefined, - results: stale, - refresh: () => this.find(type, findArgs, opts), - }; - }, - - find(type, findArgs, opts) { - let adapter = this.adapterFor(type); - return adapter.find(this, type, findArgs, opts).then((result) => { - let hydrated = this._hydrateFindResults(result, type, findArgs, opts); - - if (result.extras) { - hydrated.set("extras", result.extras); - } - - if (adapter.cache) { - const stale = adapter.findStale(this, type, findArgs, opts); - hydrated = this._updateStale(stale, hydrated, adapter.primaryKey); - adapter.cacheFind(this, type, findArgs, opts, hydrated); - } - return hydrated; - }); - }, - - _updateStale(stale, hydrated, primaryKey) { - if (!stale) { - return hydrated; - } - - hydrated.set( - "content", - hydrated.get("content").map((item) => { - let staleItem = stale.content.findBy(primaryKey, item.get(primaryKey)); - if (staleItem) { - staleItem.setProperties(item); - } else { - staleItem = item; - } - return staleItem; - }) - ); - return hydrated; - }, - - refreshResults(resultSet, type, url) { - const adapter = this.adapterFor(type); - return ajax(url).then((result) => { - const typeName = underscore(this.pluralize(adapter.apiNameFor(type))); - const content = result[typeName].map((obj) => - this._hydrate(type, obj, result) - ); - resultSet.set("content", content); - }); - }, - - appendResults(resultSet, type, url) { - const adapter = this.adapterFor(type); - return ajax(url).then((result) => { - const typeName = underscore(this.pluralize(adapter.apiNameFor(type))); - - let pageTarget = result.meta || result; - let totalRows = - pageTarget["total_rows_" + typeName] || resultSet.get("totalRows"); - let loadMoreUrl = pageTarget["load_more_" + typeName]; - let content = result[typeName].map((obj) => - this._hydrate(type, obj, result) - ); - - resultSet.setProperties({ totalRows, loadMoreUrl }); - resultSet.get("content").pushObjects(content); - - // If we've loaded them all, clear the load more URL - if (resultSet.get("length") >= totalRows) { - resultSet.set("loadMoreUrl", null); - } - }); - }, - - update(type, id, attrs) { - const adapter = this.adapterFor(type); - return adapter.update(this, type, id, attrs, function (result) { - if (result && result[type] && result[type][adapter.primaryKey]) { - const oldRecord = findAndRemoveMap(type, id); - storeMap(type, result[type][adapter.primaryKey], oldRecord); - } - return result; - }); - }, - - createRecord(type, attrs) { - attrs = attrs || {}; - const adapter = this.adapterFor(type); - return !!attrs[adapter.primaryKey] - ? this._hydrate(type, attrs) - : this._build(type, attrs); - }, - - destroyRecord(type, record) { - const adapter = this.adapterFor(type); - - // If the record is new, don't perform an Ajax call - if (record.get("isNew")) { - removeMap(type, record.get(adapter.primaryKey)); - return Promise.resolve(true); - } - - return adapter.destroyRecord(this, type, record).then(function (result) { - removeMap(type, record.get(adapter.primaryKey)); - return result; - }); - }, - - _resultSet(type, result, findArgs) { - const adapter = this.adapterFor(type); - const typeName = underscore(this.pluralize(adapter.apiNameFor(type))); - - if (!result[typeName]) { - // eslint-disable-next-line no-console - console.error(`JSON response is missing \`${typeName}\` key`, result); - return; - } - - const content = result[typeName].map((obj) => - this._hydrate(type, obj, result) - ); - - let pageTarget = result.meta || result; - - const createArgs = { - content, - findArgs, - totalRows: pageTarget["total_rows_" + typeName] || content.length, - loadMoreUrl: pageTarget["load_more_" + typeName], - refreshUrl: pageTarget["refresh_" + typeName], - resultSetMeta: result.meta, - store: this, - __type: type, - }; - - if (result.extras) { - createArgs.extras = result.extras; - } - - return ResultSet.create(createArgs); - }, - - _build(type, obj) { - const adapter = this.adapterFor(type); - obj.store = this; - obj.__type = type; - obj.__state = obj[adapter.primaryKey] ? "created" : "new"; - - // TODO: Have injections be automatic - obj.topicTrackingState = this.register.lookup("topic-tracking-state:main"); - obj.keyValueStore = this.register.lookup("key-value-store:main"); - - const klass = this.register.lookupFactory("model:" + type) || RestModel; - const model = klass.create(obj); - - storeMap(type, obj[adapter.primaryKey], model); - return model; - }, - - adapterFor(type) { - return ( - this.register.lookup("adapter:" + type) || - this.register.lookup("adapter:rest") - ); - }, - - _lookupSubType(subType, type, id, root) { - if (root.meta && root.meta.types) { - subType = root.meta.types[subType] || subType; - } - - const subTypeAdapter = this.adapterFor(subType); - const pluralType = this.pluralize(subType); - const collection = root[this.pluralize(subType)]; - if (collection) { - const hashedProp = "__hashed_" + pluralType; - let hashedCollection = root[hashedProp]; - if (!hashedCollection) { - hashedCollection = {}; - collection.forEach(function (it) { - hashedCollection[it[subTypeAdapter.primaryKey]] = it; - }); - root[hashedProp] = hashedCollection; - } - - const found = hashedCollection[id]; - if (found) { - const hydrated = this._hydrate(subType, found, root); - hashedCollection[id] = hydrated; - return hydrated; - } - } - }, - - _hydrateEmbedded(type, obj, root) { - const adapter = this.adapterFor(type); - Object.keys(obj).forEach((k) => { - if (k === adapter.primaryKey) { - return; - } - - const m = /(.+)\_id(s?)$/.exec(k); - if (m) { - const subType = m[1]; - - if (m[2]) { - const hydrated = obj[k].map((id) => - this._lookupSubType(subType, type, id, root) - ); - obj[this.pluralize(subType)] = hydrated || []; - delete obj[k]; - } else { - const hydrated = this._lookupSubType(subType, type, obj[k], root); - if (hydrated) { - obj[subType] = hydrated; - delete obj[k]; - } else { - set(obj, subType, null); - } - } - } - }); - }, - - _hydrate(type, obj, root) { - if (!obj) { - throw new Error("Can't hydrate " + type + " of `null`"); - } - - const adapter = this.adapterFor(type); - - const id = obj[adapter.primaryKey]; - if (!id) { - throw new Error( - `Can't hydrate ${type} without primaryKey: \`${adapter.primaryKey}\`` - ); - } - - root = root || obj; - - if (root.__rest_serializer === "1") { - this._hydrateEmbedded(type, obj, root); - } - - const existing = fromMap(type, id); - if (existing === obj) { - return existing; - } - - if (existing) { - delete obj[adapter.primaryKey]; - let klass = this.register.lookupFactory("model:" + type); - - if (klass && klass.class) { - klass = klass.class; - } - - if (!klass) { - klass = RestModel; - } - - existing.setProperties(klass.munge(obj)); - obj[adapter.primaryKey] = id; - return existing; - } - - return this._build(type, obj); - }, -}); - -export { flushMap }; +); diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js index 6883581b50..d5ed11eb76 100644 --- a/app/assets/javascripts/discourse/app/models/topic.js +++ b/app/assets/javascripts/discourse/app/models/topic.js @@ -15,7 +15,7 @@ import { deepMerge } from "discourse-common/lib/object"; import discourseComputed from "discourse-common/utils/decorators"; import { emojiUnescape } from "discourse/lib/text"; import { fancyTitle } from "discourse/lib/topic-fancy-title"; -import { flushMap } from "discourse/models/store"; +import { flushMap } from "discourse/services/store"; import getURL from "discourse-common/lib/get-url"; import { longDate } from "discourse/lib/formatter"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js index 5fa2e380ba..e60955dd3f 100644 --- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js +++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js @@ -8,8 +8,8 @@ import MessageBus from "message-bus-client"; import SearchService from "discourse/services/search"; import Session from "discourse/models/session"; import Site from "discourse/models/site"; -import Store from "discourse/models/store"; import User from "discourse/models/user"; +import deprecated from "discourse-common/lib/deprecated"; const ALL_TARGETS = ["controller", "component", "route", "model", "adapter"]; @@ -20,9 +20,6 @@ export function registerObjects(app) { } app.__registeredObjects__ = true; - app.register("store:main", Store); - app.register("service:store", Store); - // TODO: This should be included properly app.register("message-bus:main", MessageBus, { instantiate: false }); @@ -37,6 +34,16 @@ export default { initialize(container, app) { registerObjects(app); + app.register("store:main", { + create() { + deprecated(`"store:main" is deprecated, use "service:store" instead`, { + since: "2.8.0.beta8", + }); + + return container.lookup("service:store"); + }, + }); + let siteSettings = container.lookup("site-settings:main"); const currentUser = User.current(); diff --git a/app/assets/javascripts/discourse/app/services/store.js b/app/assets/javascripts/discourse/app/services/store.js new file mode 100644 index 0000000000..4eaf4b5211 --- /dev/null +++ b/app/assets/javascripts/discourse/app/services/store.js @@ -0,0 +1,384 @@ +import Service from "@ember/service"; +import { set } from "@ember/object"; +import { Promise } from "rsvp"; +import RestModel from "discourse/models/rest"; +import ResultSet from "discourse/models/result-set"; +import { ajax } from "discourse/lib/ajax"; +import { getRegister } from "discourse-common/lib/get-owner"; +import { underscore } from "@ember/string"; + +let _identityMap; + +// You should only call this if you're a test scaffold +function flushMap() { + _identityMap = {}; +} + +function storeMap(type, id, obj) { + if (!id) { + return; + } + + _identityMap[type] = _identityMap[type] || {}; + _identityMap[type][id] = obj; +} + +function fromMap(type, id) { + const byType = _identityMap[type]; + if (byType && byType.hasOwnProperty(id)) { + return byType[id]; + } +} + +function removeMap(type, id) { + const byType = _identityMap[type]; + if (byType && byType.hasOwnProperty(id)) { + delete byType[id]; + } +} + +function findAndRemoveMap(type, id) { + const byType = _identityMap[type]; + if (byType && byType.hasOwnProperty(id)) { + const result = byType[id]; + delete byType[id]; + return result; + } +} + +flushMap(); + +export default Service.extend({ + _plurals: { + category: "categories", + "post-reply": "post-replies", + "post-reply-history": "post_reply_histories", + reviewable_history: "reviewable_histories", + }, + + init() { + this._super(...arguments); + this.register = this.register || getRegister(this); + }, + + pluralize(thing) { + return this._plurals[thing] || thing + "s"; + }, + + addPluralization(thing, plural) { + this._plurals[thing] = plural; + }, + + findAll(type, findArgs) { + const adapter = this.adapterFor(type); + + let store = this; + return adapter.findAll(this, type, findArgs).then((result) => { + let results = this._resultSet(type, result); + if (adapter.afterFindAll) { + results = adapter.afterFindAll(results, { + lookup(subType, id) { + return store._lookupSubType(subType, type, id, result); + }, + }); + } + return results; + }); + }, + + // Mostly for legacy, things like TopicList without ResultSets + findFiltered(type, findArgs) { + return this.adapterFor(type) + .find(this, type, findArgs) + .then((result) => this._build(type, result)); + }, + + _hydrateFindResults(result, type, findArgs) { + if (typeof findArgs === "object") { + return this._resultSet(type, result, findArgs); + } else { + const apiName = this.adapterFor(type).apiNameFor(type); + return this._hydrate(type, result[underscore(apiName)], result); + } + }, + + // See if the store can find stale data. We sometimes prefer to show stale data and + // refresh it in the background. + findStale(type, findArgs, opts) { + const stale = this.adapterFor(type).findStale(this, type, findArgs, opts); + return { + hasResults: stale !== undefined, + results: stale, + refresh: () => this.find(type, findArgs, opts), + }; + }, + + find(type, findArgs, opts) { + let adapter = this.adapterFor(type); + return adapter.find(this, type, findArgs, opts).then((result) => { + let hydrated = this._hydrateFindResults(result, type, findArgs, opts); + + if (result.extras) { + hydrated.set("extras", result.extras); + } + + if (adapter.cache) { + const stale = adapter.findStale(this, type, findArgs, opts); + hydrated = this._updateStale(stale, hydrated, adapter.primaryKey); + adapter.cacheFind(this, type, findArgs, opts, hydrated); + } + return hydrated; + }); + }, + + _updateStale(stale, hydrated, primaryKey) { + if (!stale) { + return hydrated; + } + + hydrated.set( + "content", + hydrated.get("content").map((item) => { + let staleItem = stale.content.findBy(primaryKey, item.get(primaryKey)); + if (staleItem) { + staleItem.setProperties(item); + } else { + staleItem = item; + } + return staleItem; + }) + ); + return hydrated; + }, + + refreshResults(resultSet, type, url) { + const adapter = this.adapterFor(type); + return ajax(url).then((result) => { + const typeName = underscore(this.pluralize(adapter.apiNameFor(type))); + const content = result[typeName].map((obj) => + this._hydrate(type, obj, result) + ); + resultSet.set("content", content); + }); + }, + + appendResults(resultSet, type, url) { + const adapter = this.adapterFor(type); + return ajax(url).then((result) => { + const typeName = underscore(this.pluralize(adapter.apiNameFor(type))); + + let pageTarget = result.meta || result; + let totalRows = + pageTarget["total_rows_" + typeName] || resultSet.get("totalRows"); + let loadMoreUrl = pageTarget["load_more_" + typeName]; + let content = result[typeName].map((obj) => + this._hydrate(type, obj, result) + ); + + resultSet.setProperties({ totalRows, loadMoreUrl }); + resultSet.get("content").pushObjects(content); + + // If we've loaded them all, clear the load more URL + if (resultSet.get("length") >= totalRows) { + resultSet.set("loadMoreUrl", null); + } + }); + }, + + update(type, id, attrs) { + const adapter = this.adapterFor(type); + return adapter.update(this, type, id, attrs, function (result) { + if (result && result[type] && result[type][adapter.primaryKey]) { + const oldRecord = findAndRemoveMap(type, id); + storeMap(type, result[type][adapter.primaryKey], oldRecord); + } + return result; + }); + }, + + createRecord(type, attrs) { + attrs = attrs || {}; + const adapter = this.adapterFor(type); + return !!attrs[adapter.primaryKey] + ? this._hydrate(type, attrs) + : this._build(type, attrs); + }, + + destroyRecord(type, record) { + const adapter = this.adapterFor(type); + + // If the record is new, don't perform an Ajax call + if (record.get("isNew")) { + removeMap(type, record.get(adapter.primaryKey)); + return Promise.resolve(true); + } + + return adapter.destroyRecord(this, type, record).then(function (result) { + removeMap(type, record.get(adapter.primaryKey)); + return result; + }); + }, + + _resultSet(type, result, findArgs) { + const adapter = this.adapterFor(type); + const typeName = underscore(this.pluralize(adapter.apiNameFor(type))); + + if (!result[typeName]) { + // eslint-disable-next-line no-console + console.error(`JSON response is missing \`${typeName}\` key`, result); + return; + } + + const content = result[typeName].map((obj) => + this._hydrate(type, obj, result) + ); + + let pageTarget = result.meta || result; + + const createArgs = { + content, + findArgs, + totalRows: pageTarget["total_rows_" + typeName] || content.length, + loadMoreUrl: pageTarget["load_more_" + typeName], + refreshUrl: pageTarget["refresh_" + typeName], + resultSetMeta: result.meta, + store: this, + __type: type, + }; + + if (result.extras) { + createArgs.extras = result.extras; + } + + return ResultSet.create(createArgs); + }, + + _build(type, obj) { + const adapter = this.adapterFor(type); + obj.store = this; + obj.__type = type; + obj.__state = obj[adapter.primaryKey] ? "created" : "new"; + + // TODO: Have injections be automatic + obj.topicTrackingState = this.register.lookup("topic-tracking-state:main"); + obj.keyValueStore = this.register.lookup("key-value-store:main"); + + const klass = this.register.lookupFactory("model:" + type) || RestModel; + const model = klass.create(obj); + + storeMap(type, obj[adapter.primaryKey], model); + return model; + }, + + adapterFor(type) { + return ( + this.register.lookup("adapter:" + type) || + this.register.lookup("adapter:rest") + ); + }, + + _lookupSubType(subType, type, id, root) { + if (root.meta && root.meta.types) { + subType = root.meta.types[subType] || subType; + } + + const subTypeAdapter = this.adapterFor(subType); + const pluralType = this.pluralize(subType); + const collection = root[this.pluralize(subType)]; + if (collection) { + const hashedProp = "__hashed_" + pluralType; + let hashedCollection = root[hashedProp]; + if (!hashedCollection) { + hashedCollection = {}; + collection.forEach(function (it) { + hashedCollection[it[subTypeAdapter.primaryKey]] = it; + }); + root[hashedProp] = hashedCollection; + } + + const found = hashedCollection[id]; + if (found) { + const hydrated = this._hydrate(subType, found, root); + hashedCollection[id] = hydrated; + return hydrated; + } + } + }, + + _hydrateEmbedded(type, obj, root) { + const adapter = this.adapterFor(type); + Object.keys(obj).forEach((k) => { + if (k === adapter.primaryKey) { + return; + } + + const m = /(.+)\_id(s?)$/.exec(k); + if (m) { + const subType = m[1]; + + if (m[2]) { + const hydrated = obj[k].map((id) => + this._lookupSubType(subType, type, id, root) + ); + obj[this.pluralize(subType)] = hydrated || []; + delete obj[k]; + } else { + const hydrated = this._lookupSubType(subType, type, obj[k], root); + if (hydrated) { + obj[subType] = hydrated; + delete obj[k]; + } else { + set(obj, subType, null); + } + } + } + }); + }, + + _hydrate(type, obj, root) { + if (!obj) { + throw new Error("Can't hydrate " + type + " of `null`"); + } + + const adapter = this.adapterFor(type); + + const id = obj[adapter.primaryKey]; + if (!id) { + throw new Error( + `Can't hydrate ${type} without primaryKey: \`${adapter.primaryKey}\`` + ); + } + + root = root || obj; + + if (root.__rest_serializer === "1") { + this._hydrateEmbedded(type, obj, root); + } + + const existing = fromMap(type, id); + if (existing === obj) { + return existing; + } + + if (existing) { + delete obj[adapter.primaryKey]; + let klass = this.register.lookupFactory("model:" + type); + + if (klass && klass.class) { + klass = klass.class; + } + + if (!klass) { + klass = RestModel; + } + + existing.setProperties(klass.munge(obj)); + obj[adapter.primaryKey] = id; + return existing; + } + + return this._build(type, obj); + }, +}); + +export { flushMap }; diff --git a/app/assets/javascripts/discourse/tests/helpers/create-store.js b/app/assets/javascripts/discourse/tests/helpers/create-store.js index ad15ffd4fa..93a8520d6f 100644 --- a/app/assets/javascripts/discourse/tests/helpers/create-store.js +++ b/app/assets/javascripts/discourse/tests/helpers/create-store.js @@ -1,6 +1,6 @@ import KeyValueStore from "discourse/lib/key-value-store"; import RestAdapter from "discourse/adapters/rest"; -import Store from "discourse/models/store"; +import Store from "discourse/services/store"; import TopicListAdapter from "discourse/adapters/topic-list"; import TopicTrackingState from "discourse/models/topic-tracking-state"; import { buildResolver } from "discourse-common/resolver"; diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js index 439751b7e2..84e9aa5aa0 100644 --- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js +++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js @@ -21,7 +21,7 @@ import { _clearSnapshots } from "select-kit/components/composer-actions"; import { clearHTMLCache } from "discourse/helpers/custom-html"; import createStore from "discourse/tests/helpers/create-store"; import deprecated from "discourse-common/lib/deprecated"; -import { flushMap } from "discourse/models/store"; +import { flushMap } from "discourse/services/store"; import { initSearchData } from "discourse/widgets/search-menu"; import { resetPostMenuExtraButtons } from "discourse/widgets/post-menu"; import { isEmpty } from "@ember/utils"; diff --git a/app/assets/javascripts/discourse/tests/setup-tests.js b/app/assets/javascripts/discourse/tests/setup-tests.js index ec7f80b578..7091b47143 100644 --- a/app/assets/javascripts/discourse/tests/setup-tests.js +++ b/app/assets/javascripts/discourse/tests/setup-tests.js @@ -27,7 +27,7 @@ import bootbox from "bootbox"; import { buildResolver } from "discourse-common/resolver"; import { createHelperContext } from "discourse-common/lib/helpers"; import deprecated from "discourse-common/lib/deprecated"; -import { flushMap } from "discourse/models/store"; +import { flushMap } from "discourse/services/store"; import { registerObjects } from "discourse/pre-initializers/inject-discourse-objects"; import sinon from "sinon"; import { run } from "@ember/runloop"; From 40218426289932d18da84f717d1e7226371763ec Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 18 Nov 2021 16:52:03 +0100 Subject: [PATCH 012/168] DEV: Make `search` an actual service (#14998) --- .../discourse/app/lib/keyboard-shortcuts.js | 2 +- .../inject-discourse-objects.js | 17 ++++++++++++++--- .../discourse/app/services/search.js | 17 +++++++---------- .../javascripts/discourse/app/widgets/header.js | 8 +++----- .../app/widgets/search-menu-results.js | 5 ++--- .../discourse/app/widgets/search-menu.js | 12 +++--------- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js index b97787fed5..93efb02416 100644 --- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js +++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js @@ -104,7 +104,7 @@ export default { this.container = container; this._stopCallback(); - this.searchService = this.container.lookup("search-service:main"); + this.searchService = this.container.lookup("service:search"); this.appEvents = this.container.lookup("service:app-events"); this.currentUser = this.container.lookup("current-user:main"); this.siteSettings = this.container.lookup("site-settings:main"); diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js index e60955dd3f..2a92f321fb 100644 --- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js +++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js @@ -5,7 +5,6 @@ import PrivateMessageTopicTrackingState from "discourse/models/private-message-t import DiscourseLocation from "discourse/lib/discourse-location"; import KeyValueStore from "discourse/lib/key-value-store"; import MessageBus from "message-bus-client"; -import SearchService from "discourse/services/search"; import Session from "discourse/models/session"; import Site from "discourse/models/site"; import User from "discourse/models/user"; @@ -79,14 +78,26 @@ export default { const keyValueStore = new KeyValueStore("discourse_"); app.register("key-value-store:main", keyValueStore, { instantiate: false }); - app.register("search-service:main", SearchService); + + app.register("search-service:main", { + create() { + deprecated( + `"search-service:main" is deprecated, use "service:search" instead`, + { + since: "2.8.0.beta8", + } + ); + + return container.lookup("service:search"); + }, + }); ALL_TARGETS.forEach((t) => { app.inject(t, "appEvents", "service:app-events"); app.inject(t, "pmTopicTrackingState", "pm-topic-tracking-state:main"); app.inject(t, "store", "service:store"); app.inject(t, "site", "site:main"); - app.inject(t, "searchService", "search-service:main"); + app.inject(t, "searchService", "service:search"); app.inject(t, "keyValueStore", "key-value-store:main"); }); diff --git a/app/assets/javascripts/discourse/app/services/search.js b/app/assets/javascripts/discourse/app/services/search.js index a702e9980b..2fe2dacaec 100644 --- a/app/assets/javascripts/discourse/app/services/search.js +++ b/app/assets/javascripts/discourse/app/services/search.js @@ -1,7 +1,7 @@ -import EmberObject, { get } from "@ember/object"; +import Service from "@ember/service"; import discourseComputed from "discourse-common/utils/decorators"; -export default EmberObject.extend({ +export default Service.extend({ searchContextEnabled: false, // checkbox to scope search searchContext: null, highlightTerm: null, @@ -9,16 +9,13 @@ export default EmberObject.extend({ @discourseComputed("searchContext") contextType: { get(searchContext) { - if (searchContext) { - return get(searchContext, "type"); - } + return searchContext?.type; }, + set(value, searchContext) { - // a bit hacky, consider cleaning this up, need to work through all observers though - const context = Object.assign({}, searchContext); - context.type = value; - this.set("searchContext", context); - return this.get("searchContext.type"); + this.set("searchContext", { ...searchContext, type: value }); + + return value; }, }, }); diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js index 9cfd4091f6..377e76304d 100644 --- a/app/assets/javascripts/discourse/app/widgets/header.js +++ b/app/assets/javascripts/discourse/app/widgets/header.js @@ -328,7 +328,7 @@ export function attachAdditionalPanel(name, toggle, transformAttrs) { export default createWidget("header", { tagName: "header.d-header.clearfix", buildKey: () => `header`, - services: ["router"], + services: ["router", "search"], defaultState() { let states = { @@ -408,8 +408,7 @@ export default createWidget("header", { updateHighlight() { if (!this.state.searchVisible) { - const service = this.register.lookup("search-service:main"); - service.set("highlightTerm", ""); + this.search.set("highlightTerm", ""); } }, @@ -447,8 +446,7 @@ export default createWidget("header", { toggleSearchMenu() { if (this.site.mobileView) { - const searchService = this.register.lookup("search-service:main"); - const context = searchService.get("searchContext"); + const context = this.search.searchContext; let params = ""; if (context) { diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js index f3f0b7af32..d607ad3de5 100644 --- a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js +++ b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js @@ -498,15 +498,14 @@ createWidget("search-menu-assistant", { createWidget("search-menu-initial-options", { tagName: "ul.search-menu-initial-options", + services: ["search"], html(attrs) { if (attrs.term?.match(MODIFIER_REGEXP)) { return this.defaultRow(attrs.term); } - const service = this.register.lookup("search-service:main"); - const ctx = service.get("searchContext"); - + const ctx = this.search.searchContext; const content = []; if (attrs.term || ctx) { diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js index e5366f5be6..4b52448038 100644 --- a/app/assets/javascripts/discourse/app/widgets/search-menu.js +++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js @@ -185,6 +185,7 @@ const SearchHelper = { export default createWidget("search-menu", { tagName: "div.search-menu", + services: ["search"], searchData, buildKey: () => "search-menu", @@ -306,13 +307,6 @@ export default createWidget("search-menu", { this.triggerSearch(); }, - searchService() { - if (!this._searchService) { - this._searchService = this.register.lookup("search-service:main"); - } - return this._searchService; - }, - html(attrs, state) { if (attrs.inTopicContext === false) { state.inTopicContext = false; @@ -450,7 +444,7 @@ export default createWidget("search-menu", { searchData.noResults = false; if (SearchHelper.includesTopics()) { if (this.state.inTopicContext) { - this.searchService().set("highlightTerm", searchData.term); + this.search.set("highlightTerm", searchData.term); } searchData.loading = true; @@ -500,7 +494,7 @@ export default createWidget("search-menu", { searchContext() { if (this.state.inTopicContext) { - return this.searchService().get("searchContext"); + return this.search.searchContext; } return false; From 82c72a46d1da20360235aed3f42b84119dd8b4cf Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 18 Nov 2021 16:52:14 +0100 Subject: [PATCH 013/168] DEV: Fix `castInteger` deprecations (#15004) --- .../components/groups-form-interaction-fields.hbs | 4 +++- .../discourse/app/templates/full-page-search.hbs | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs index 7681b30a85..ad186711ea 100644 --- a/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs @@ -8,9 +8,11 @@ valueProperty="value" value=model.visibility_level content=visibilityLevelOptions - castInteger=true class="groups-form-visibility-level" onChange=(action (mut model.visibility_level)) + options=(hash + castInteger=true + ) }}
diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs index 4c9eee8c2a..795d559a1a 100644 --- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs +++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs @@ -24,8 +24,10 @@ id="search-type" value=search_type content=searchTypes - castInteger=true onChange=(action (mut search_type)) + options=(hash + castInteger=true + ) }} {{d-button action=(action "search" (hash collapseFilters=true)) @@ -90,9 +92,11 @@ {{combo-box value=sortOrder content=sortOrders - castInteger=true onChange=(action (mut sortOrder)) id="search-sort-by" + options=(hash + castInteger=true + ) }}
From 8dc9e0f4bd172e91a343836768af96e2471ff38d Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 18 Nov 2021 16:54:47 +0100 Subject: [PATCH 014/168] DEV: Use `class` syntax in key-value-store (#15005) --- .../discourse/app/lib/key-value-store.js | 35 +++++++++++-------- .../tests/unit/lib/key-value-store-test.js | 27 +++++++++++--- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/key-value-store.js b/app/assets/javascripts/discourse/app/lib/key-value-store.js index 94c67018b9..1b67bf52a3 100644 --- a/app/assets/javascripts/discourse/app/lib/key-value-store.js +++ b/app/assets/javascripts/discourse/app/lib/key-value-store.js @@ -14,11 +14,13 @@ try { safeLocalStorage = null; } -const KeyValueStore = function (ctx) { - this.context = ctx; -}; +export default class KeyValueStore { + context = null; + + constructor(ctx) { + this.context = ctx; + } -KeyValueStore.prototype = { abandonLocal() { if (!safeLocalStorage) { return; @@ -32,57 +34,64 @@ KeyValueStore.prototype = { } i--; } + return true; - }, + } remove(key) { if (!safeLocalStorage) { return; } + return safeLocalStorage.removeItem(this.context + key); - }, + } set(opts) { if (!safeLocalStorage) { return false; } + safeLocalStorage[this.context + opts.key] = opts.value; - }, + } setObject(opts) { this.set({ key: opts.key, value: JSON.stringify(opts.value) }); - }, + } get(key) { if (!safeLocalStorage) { return null; } return safeLocalStorage[this.context + key]; - }, + } getInt(key, def) { if (!def) { def = 0; } + if (!safeLocalStorage) { return def; } + const result = parseInt(this.get(key), 10); if (!isFinite(result)) { return def; } + return result; - }, + } getObject(key) { if (!safeLocalStorage) { return null; } + try { return JSON.parse(safeLocalStorage[this.context + key]); } catch (e) {} - }, -}; + } +} // API compatibility with `localStorage` KeyValueStore.prototype.getItem = KeyValueStore.prototype.get; @@ -90,5 +99,3 @@ KeyValueStore.prototype.removeItem = KeyValueStore.prototype.remove; KeyValueStore.prototype.setItem = function (key, value) { this.set({ key, value }); }; - -export default KeyValueStore; diff --git a/app/assets/javascripts/discourse/tests/unit/lib/key-value-store-test.js b/app/assets/javascripts/discourse/tests/unit/lib/key-value-store-test.js index 243dc9a981..ed323d85b9 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/key-value-store-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/key-value-store-test.js @@ -2,18 +2,37 @@ import { module, test } from "qunit"; import KeyValueStore from "discourse/lib/key-value-store"; module("Unit | Utility | key-value-store", function () { - test("it's able to get the result back from the store", function (assert) { - const store = new KeyValueStore("_test"); + test("is able to get the result back from the store", function (assert) { + const store = new KeyValueStore("test_"); store.set({ key: "bob", value: "uncle" }); + assert.strictEqual(store.get("bob"), "uncle"); }); + test("is able remove items from the store", function (assert) { + const store = new KeyValueStore("test_"); + store.set({ key: "bob", value: "uncle" }); + store.remove("bob"); + + assert.strictEqual(store.get("bob"), undefined); + }); + test("is able to nuke the store", function (assert) { - const store = new KeyValueStore("_test"); + const store = new KeyValueStore("test_"); store.set({ key: "bob1", value: "uncle" }); store.abandonLocal(); localStorage.a = 1; - assert.strictEqual(store.get("bob1"), void 0); + + assert.strictEqual(store.get("bob1"), undefined); assert.strictEqual(localStorage.a, "1"); }); + + test("is API-compatible with `localStorage`", function (assert) { + const store = new KeyValueStore("test_"); + store.setItem("bob", "uncle"); + assert.strictEqual(store.getItem("bob"), "uncle"); + + store.removeItem("bob"); + assert.strictEqual(store.getItem("bob"), undefined); + }); }); From a10267352220837c0298d84d399bb1c0b8874562 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 18 Nov 2021 17:11:59 +0100 Subject: [PATCH 015/168] DEV: Avoid unnecessary `site-settings:main` lookups (#15006) --- .../admin/addon/services/admin-tools.js | 14 +++----------- .../discourse/app/lib/keyboard-shortcuts.js | 4 +--- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/admin/addon/services/admin-tools.js b/app/assets/javascripts/admin/addon/services/admin-tools.js index fe282fefd6..a90df7de8e 100644 --- a/app/assets/javascripts/admin/addon/services/admin-tools.js +++ b/app/assets/javascripts/admin/addon/services/admin-tools.js @@ -1,8 +1,4 @@ import AdminUser from "admin/models/admin-user"; -// A service that can act as a bridge between the front end Discourse application -// and the admin application. Use this if you need front end code to access admin -// modules. Inject it optionally, and if it exists go to town! - import I18n from "I18n"; import { Promise } from "rsvp"; import Service from "@ember/service"; @@ -12,14 +8,10 @@ import { getOwner } from "discourse-common/lib/get-owner"; import { iconHTML } from "discourse-common/lib/icon-library"; import showModal from "discourse/lib/show-modal"; +// A service that can act as a bridge between the front end Discourse application +// and the admin application. Use this if you need front end code to access admin +// modules. Inject it optionally, and if it exists go to town! export default Service.extend({ - init() { - this._super(...arguments); - - // TODO: Make `siteSettings` a service that can be injected - this.siteSettings = getOwner(this).lookup("site-settings:main"); - }, - showActionLogs(target, filters) { const controller = getOwner(target).lookup( "controller:adminLogs.staffActionLogs" diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js index 93efb02416..f3bd4367c3 100644 --- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js +++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js @@ -744,9 +744,7 @@ export default { }, categoriesTopicsList() { - const setting = this.container.lookup("site-settings:main") - .desktop_category_page_style; - switch (setting) { + switch (this.siteSettings.desktop_category_page_style) { case "categories_with_featured_topics": return $(".latest .featured-topic"); case "categories_and_latest_topics": From 135fdd59edca074ba7b5bc7244a587462020ec5a Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 18 Nov 2021 16:38:00 +0000 Subject: [PATCH 016/168] PERF: Improve JS app boot speed by optimizing `customResolve()` (#14990) Time spent in the 'find module with suffix' portion of our `customResolve` function were adding up to around 100ms-150ms when booting the app. This time is spread over 150+ calls, so it's not immediately obvious in flamegraphs. This commit implements a (reversed) [Trie](https://en.wikipedia.org/wiki/Trie) which enables fast suffix-based lookups on a list of strings. In my tests, this requires < 5ms to initialize, and brings the cumulative 'find module with suffix' time down to `< 5ms`. This corresponds to a ~100ms improvement in LCP metrics in my browser. The only behavior change is to remove support for module filenames which are **not** dasherized. I haven't found any core/theme/plugin modules which are not dasherized in their filenames. --- .../discourse-common/addon/lib/suffix-trie.js | 87 +++++++++++++++++++ .../discourse-common/addon/resolver.js | 22 +++-- .../tests/unit/lib/suffix-trie-test.js | 30 +++++++ 3 files changed, 132 insertions(+), 7 deletions(-) create mode 100644 app/assets/javascripts/discourse-common/addon/lib/suffix-trie.js create mode 100644 app/assets/javascripts/discourse/tests/unit/lib/suffix-trie-test.js diff --git a/app/assets/javascripts/discourse-common/addon/lib/suffix-trie.js b/app/assets/javascripts/discourse-common/addon/lib/suffix-trie.js new file mode 100644 index 0000000000..a82358e4f7 --- /dev/null +++ b/app/assets/javascripts/discourse-common/addon/lib/suffix-trie.js @@ -0,0 +1,87 @@ +class TrieNode { + constructor(name, parent) { + this.name = name; + this.parent = parent; + this.children = new Map(); + this.leafIndex = null; + } +} + +// Given a set of strings, this class can allow efficient lookups +// based on suffixes. +// +// By default, it will create one Trie node per character. If your data +// has known delimiters (e.g. / in file paths), you can pass a separator +// to the constructor for better performance. +// +// Matching results will be returned in insertion order +export default class SuffixTrie { + constructor(separator = "") { + this._trie = new TrieNode(); + this.separator = separator; + this._nextIndex = 0; + } + + add(value) { + const nodeNames = value.split(this.separator); + let currentNode = this._trie; + + // Iterate over the nodes backwards. The last one should be + // at the root of the tree + for (let i = nodeNames.length - 1; i >= 0; i--) { + let newNode = currentNode.children.get(nodeNames[i]); + if (!newNode) { + newNode = new TrieNode(nodeNames[i], currentNode); + currentNode.children.set(nodeNames[i], newNode); + } + currentNode = newNode; + } + + currentNode.leafIndex = this._nextIndex++; + } + + withSuffix(suffix, resultCount = null) { + const nodeNames = suffix.split(this.separator); + + // Traverse the tree to find the root node for this suffix + let node = this._trie; + for (let i = nodeNames.length - 1; i >= 0; i--) { + node = node.children.get(nodeNames[i]); + if (!node) { + return []; + } + } + + // Find all the leaves which are descendents of that node + const leaves = []; + const descendentNodes = [node]; + while (descendentNodes.length > 0) { + const thisDescendent = descendentNodes.pop(); + if (thisDescendent.leafIndex !== null) { + leaves.push(thisDescendent); + } + descendentNodes.push(...thisDescendent.children.values()); + } + + // Sort them in-place according to insertion order + leaves.sort((a, b) => (a.leafIndex < b.leafIndex ? -1 : 1)); + + // If a subset of results have been requested, truncate + if (resultCount !== null) { + leaves.splice(resultCount); + } + + // Calculate their full names, and return the joined string + return leaves.map((leafNode) => { + const parts = [leafNode.name]; + + let ancestorNode = leafNode; + while (typeof ancestorNode.parent?.name === "string") { + parts.push(ancestorNode.parent.name); + ancestorNode = ancestorNode.parent; + } + + return parts.join(this.separator); + }); + } +} diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js index 057f173563..22d13c56ca 100644 --- a/app/assets/javascripts/discourse-common/addon/resolver.js +++ b/app/assets/javascripts/discourse-common/addon/resolver.js @@ -2,8 +2,10 @@ import { classify, dasherize } from "@ember/string"; import deprecated from "discourse-common/lib/deprecated"; import { findHelper } from "discourse-common/lib/helpers"; import { get } from "@ember/object"; +import SuffixTrie from "discourse-common/lib/suffix-trie"; let _options = {}; +let moduleSuffixTrie = null; export function setResolverOption(name, value) { _options[name] = value; @@ -34,6 +36,18 @@ function parseName(fullName) { }; } +function lookupModuleBySuffix(suffix) { + if (!moduleSuffixTrie) { + moduleSuffixTrie = new SuffixTrie("/"); + Object.keys(requirejs.entries).forEach((name) => { + if (!name.includes("/templates/")) { + moduleSuffixTrie.add(name); + } + }); + } + return moduleSuffixTrie.withSuffix(suffix, 1)[0]; +} + export function buildResolver(baseName) { return Ember.DefaultResolver.extend({ parseName, @@ -107,13 +121,7 @@ export function buildResolver(baseName) { // If we end with the name we want, use it. This allows us to define components within plugins. const suffix = parsedName.type + "s/" + parsedName.fullNameWithoutType, dashed = dasherize(suffix), - moduleName = Object.keys(requirejs.entries).find(function (e) { - return ( - e.indexOf("/templates/") === -1 && - (e.indexOf(suffix, e.length - suffix.length) !== -1 || - e.indexOf(dashed, e.length - dashed.length) !== -1) - ); - }); + moduleName = lookupModuleBySuffix(dashed); let module; if (moduleName) { diff --git a/app/assets/javascripts/discourse/tests/unit/lib/suffix-trie-test.js b/app/assets/javascripts/discourse/tests/unit/lib/suffix-trie-test.js new file mode 100644 index 0000000000..363c287db2 --- /dev/null +++ b/app/assets/javascripts/discourse/tests/unit/lib/suffix-trie-test.js @@ -0,0 +1,30 @@ +import { module, test } from "qunit"; +import SuffixTrie from "discourse-common/lib/suffix-trie"; + +module("Unit | SuffixTrie", function () { + test("SuffixTrie", function (assert) { + const t = new SuffixTrie("/"); + t.add("a/b/c/d"); + t.add("b/a/c/d"); + t.add("c/b/a/d"); + t.add("d/c/b/a"); + + t.add("a/b/c/d/"); + t.add("/a/b/c/d/"); + + // Simple lookups + assert.deepEqual(t.withSuffix("d"), ["a/b/c/d", "b/a/c/d", "c/b/a/d"]); + assert.deepEqual(t.withSuffix("c/d"), ["a/b/c/d", "b/a/c/d"]); + assert.deepEqual(t.withSuffix("b/c/d"), ["a/b/c/d"]); + assert.deepEqual(t.withSuffix("a/b/c/d"), ["a/b/c/d"]); + assert.deepEqual(t.withSuffix("b/a"), ["d/c/b/a"]); + + // With leading/trailing delimiters + assert.deepEqual(t.withSuffix("c/d/"), ["a/b/c/d/", "/a/b/c/d/"]); + assert.deepEqual(t.withSuffix("/a/b/c/d/"), ["/a/b/c/d/"]); + + // Limited lookups + assert.deepEqual(t.withSuffix("d", 1), ["a/b/c/d"]); + assert.deepEqual(t.withSuffix("d", 2), ["a/b/c/d", "b/a/c/d"]); + }); +}); From 510219a0daef50056420762f446aac4c88c90ba1 Mon Sep 17 00:00:00 2001 From: Daniel Waterworth Date: Thu, 18 Nov 2021 11:36:34 -0600 Subject: [PATCH 017/168] DEV: Hide message bus site settings (#15009) Admins don't need to be changing these. --- config/site_settings.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/site_settings.yml b/config/site_settings.yml index 39835d5a88..a927de4c5f 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1863,26 +1863,33 @@ developer: hidden: true default: "" enable_long_polling: + hidden: true client: true default: true enable_chunked_encoding: + hidden: true client: true default: true long_polling_interval: + hidden: true default: 25000 max: 25000 long_polling_base_url: + hidden: true client: true default: "/" background_polling_interval: + hidden: true client: true default: 60000 max: 99000 polling_interval: + hidden: true client: true default: 3000 max: 99000 anon_polling_interval: + hidden: true client: true default: 30000 max: 99000 From ed2c3ebd7118955789897d0dc5b0d16d0c5e9235 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 18 Nov 2021 18:02:16 +0000 Subject: [PATCH 018/168] PERF: Move `preload` hints to the `` (#15008) We have two JS assets which are included in the `` of responses. We were including the `` so that the browser discovers it earlier, and can start preloading the assets while the body is loading. --- app/views/layouts/application.html.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 23c2fbda66..53a4410a6c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,6 +21,8 @@ <%= build_plugin_html 'server:before-script-load' %> + " as="script"> + " as="script"> <%= preload_script 'browser-detect' %> <%= preload_script "locales/#{I18n.locale}" %> @@ -113,11 +115,12 @@ <% end %> - <%= preload_script "start-discourse" %> + + <%= yield :data %> - <%= preload_script 'browser-update' %> + <%- unless customization_disabled? %> <%= theme_lookup("body_tag") %> From 6ae065f9cd101ff14c3fda77d41b05364cae80d6 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Thu, 18 Nov 2021 20:19:02 +0200 Subject: [PATCH 019/168] Improved create invite modal (#14151) * FEATURE: Always show advanced invite options The UI is more simple and more efficient than how it was when the advanced options toggle was introduced. It does not make sense to keep it anymore. * UX: Minor copy edits * UX: Merge expire invite controls There were two controls in the create invite modal. One was a static text that displayed how much time is left until the invite expires. The other one was a datetime selector that set the time the invite expires. This commit merges the two controls in a single one: staff users will continue to see the datetime selector without the static text and regular users will only see the static text because they cannot set when the invite expires. * UX: Remove invite link It should only be visible after the invite was created. --- .../app/components/future-date-input.js | 52 ++++- .../app/controllers/create-invite.js | 78 ++++---- .../discourse/app/controllers/share-topic.js | 6 +- .../app/controllers/user-invited-show.js | 3 +- .../discourse/app/routes/group-index.js | 2 - .../app/templates/modal/create-invite.hbs | 182 +++++++++--------- .../acceptance/create-invite-modal-test.js | 51 +---- .../stylesheets/common/base/share_link.scss | 18 +- app/assets/stylesheets/desktop/modal.scss | 5 + config/locales/client.en.yml | 8 +- config/site_settings.yml | 1 + 11 files changed, 213 insertions(+), 193 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/future-date-input.js b/app/assets/javascripts/discourse/app/components/future-date-input.js index f673f73ae5..3f17a595ec 100644 --- a/app/assets/javascripts/discourse/app/components/future-date-input.js +++ b/app/assets/javascripts/discourse/app/components/future-date-input.js @@ -1,8 +1,10 @@ -import { and, empty, equal } from "@ember/object/computed"; -import { action } from "@ember/object"; import Component from "@ember/component"; -import { FORMAT } from "select-kit/components/future-date-input-selector"; +import { action } from "@ember/object"; +import { and, empty, equal } from "@ember/object/computed"; +import { CLOSE_STATUS_TYPE } from "discourse/controllers/edit-topic-timer"; +import buildTimeframes from "discourse/lib/timeframes-builder"; import I18n from "I18n"; +import { FORMAT } from "select-kit/components/future-date-input-selector"; export default Component.extend({ selection: null, @@ -20,12 +22,17 @@ export default Component.extend({ this._super(...arguments); if (this.input) { - const datetime = moment(this.input); - this.setProperties({ - selection: "pick_date_and_time", - _date: datetime.format("YYYY-MM-DD"), - _time: datetime.format("HH:mm"), - }); + const dateTime = moment(this.input); + const closestTimeframe = this.findClosestTimeframe(dateTime); + if (closestTimeframe) { + this.set("selection", closestTimeframe.id); + } else { + this.setProperties({ + selection: "pick_date_and_time", + _date: dateTime.format("YYYY-MM-DD"), + _time: dateTime.format("HH:mm"), + }); + } } }, @@ -64,4 +71,31 @@ export default Component.extend({ this.attrs.onChangeInput && this.attrs.onChangeInput(null); } }, + + findClosestTimeframe(dateTime) { + const now = moment(); + + const futureDateInputSelectorOptions = { + now, + day: now.day(), + includeWeekend: this.includeWeekend, + includeMidFuture: this.includeMidFuture || true, + includeFarFuture: this.includeFarFuture, + includeDateTime: this.includeDateTime, + canScheduleNow: this.includeNow || false, + canScheduleToday: 24 - now.hour() > 6, + }; + + return buildTimeframes(futureDateInputSelectorOptions).find((tf) => { + const tfDateTime = tf.when( + moment(), + this.statusType !== CLOSE_STATUS_TYPE ? 8 : 18 + ); + + if (tfDateTime) { + const diff = tfDateTime.diff(dateTime); + return 0 <= diff && diff < 60 * 1000; + } + }); + }, }); diff --git a/app/assets/javascripts/discourse/app/controllers/create-invite.js b/app/assets/javascripts/discourse/app/controllers/create-invite.js index 1a77404237..2a4cb7e841 100644 --- a/app/assets/javascripts/discourse/app/controllers/create-invite.js +++ b/app/assets/javascripts/discourse/app/controllers/create-invite.js @@ -9,6 +9,7 @@ import ModalFunctionality from "discourse/mixins/modal-functionality"; import Group from "discourse/models/group"; import Invite from "discourse/models/invite"; import I18n from "I18n"; +import { FORMAT } from "select-kit/components/future-date-input-selector"; export default Controller.extend( ModalFunctionality, @@ -16,13 +17,16 @@ export default Controller.extend( { allGroups: null, + flashText: null, + flashClass: null, + flashLink: false, + invite: null, invites: null, - showAdvanced: false, + editing: false, inviteToTopic: false, limitToEmail: false, - autogenerated: false, isLink: empty("buffered.email"), isEmail: notEmpty("buffered.email"), @@ -33,37 +37,33 @@ export default Controller.extend( }); this.setProperties({ + flashText: null, + flashClass: null, + flashLink: false, invite: null, invites: null, - showAdvanced: false, + editing: false, inviteToTopic: false, limitToEmail: false, - autogenerated: false, }); this.setInvite(Invite.create()); + this.buffered.setProperties({ + max_redemptions_allowed: 1, + expires_at: moment() + .add(this.siteSettings.invite_expiry_days, "days") + .format(FORMAT), + }); }, onClose() { - if (this.autogenerated) { - this.invite - .destroy() - .then(() => this.invites && this.invites.removeObject(this.invite)); - } + this.appEvents.trigger("modal-body:clearFlash"); }, setInvite(invite) { this.set("invite", invite); }, - setAutogenerated(value) { - if (this.invites && (this.autogenerated || !this.invite.id) && !value) { - this.invites.unshiftObject(this.invite); - } - - this.set("autogenerated", value); - }, - save(opts) { const data = { ...this.buffered.buffer }; @@ -101,29 +101,37 @@ export default Controller.extend( .save(data) .then((result) => { this.rollbackBuffer(); - this.setAutogenerated(opts.autogenerated); + + if ( + this.invites && + !this.invites.any((i) => i.id === this.invite.id) + ) { + this.invites.unshiftObject(this.invite); + } + if (result.warnings) { - this.appEvents.trigger("modal-body:flash", { - text: result.warnings.join(","), - messageClass: "warning", + this.setProperties({ + flashText: result.warnings.join(","), + flashClass: "warning", + flashLink: !this.editing, }); - } else if (!this.autogenerated) { + } else { if (this.isEmail && opts.sendEmail) { this.send("closeModal"); } else { - this.appEvents.trigger("modal-body:flash", { - text: opts.copy - ? I18n.t("user.invited.invite.invite_copied") - : I18n.t("user.invited.invite.invite_saved"), - messageClass: "success", + this.setProperties({ + flashText: I18n.t("user.invited.invite.invite_saved"), + flashClass: "success", + flashLink: !this.editing, }); } } }) .catch((e) => - this.appEvents.trigger("modal-body:flash", { - text: extractError(e), - messageClass: "error", + this.setProperties({ + flashText: extractError(e), + flashClass: "error", + flashLink: false, }) ); }, @@ -155,11 +163,6 @@ export default Controller.extend( return staff || groups.any((g) => g.owner); }, - @discourseComputed("currentUser.staff", "isEmail", "canInviteToGroup") - hasAdvanced(staff, isEmail, canInviteToGroup) { - return staff || isEmail || canInviteToGroup; - }, - @action copied() { this.save({ sendEmail: false, copy: true }); @@ -178,10 +181,5 @@ export default Controller.extend( this.set("buffered.email", result[0].email[0]); }); }, - - @action - toggleAdvanced() { - this.toggleProperty("showAdvanced"); - }, } ); diff --git a/app/assets/javascripts/discourse/app/controllers/share-topic.js b/app/assets/javascripts/discourse/app/controllers/share-topic.js index d1c3657be0..e3cf0ed5c9 100644 --- a/app/assets/javascripts/discourse/app/controllers/share-topic.js +++ b/app/assets/javascripts/discourse/app/controllers/share-topic.js @@ -128,15 +128,11 @@ export default Controller.extend( inviteUsers() { this.set("showNotifyUsers", false); const controller = showModal("create-invite"); - controller.setProperties({ - showAdvanced: true, - inviteToTopic: true, - }); + controller.set("inviteToTopic", true); controller.buffered.setProperties({ topicId: this.topic.id, topicTitle: this.topic.title, }); - controller.save({ autogenerated: true }); }, } ); diff --git a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js index f7f98519a9..50c36460c1 100644 --- a/app/assets/javascripts/discourse/app/controllers/user-invited-show.js +++ b/app/assets/javascripts/discourse/app/controllers/user-invited-show.js @@ -66,7 +66,6 @@ export default Controller.extend({ createInvite() { const controller = showModal("create-invite"); controller.set("invites", this.model.invites); - controller.save({ autogenerated: true }); }, @action @@ -77,7 +76,7 @@ export default Controller.extend({ @action editInvite(invite) { const controller = showModal("create-invite"); - controller.set("showAdvanced", true); + controller.set("editing", true); controller.setInvite(invite); }, diff --git a/app/assets/javascripts/discourse/app/routes/group-index.js b/app/assets/javascripts/discourse/app/routes/group-index.js index 1a9ff92a92..c128678090 100644 --- a/app/assets/javascripts/discourse/app/routes/group-index.js +++ b/app/assets/javascripts/discourse/app/routes/group-index.js @@ -32,9 +32,7 @@ export default DiscourseRoute.extend({ showInviteModal() { const model = this.modelFor("group"); const controller = showModal("create-invite"); - controller.set("showAdvanced", true); controller.buffered.set("groupIds", [model.id]); - controller.save({ autogenerated: true }); }, @action diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs index 6754afe8d7..d31844c484 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs @@ -1,21 +1,40 @@ -{{#d-modal-body title=(if invite.id "user.invited.invite.edit_title" "user.invited.invite.new_title")}} -
-
- -
- {{input - name="invite-link" - class="invite-link" - value=invite.link - readonly=true - }} - {{copy-button selector="input.invite-link" copied=(action "copied")}} +{{#if flashText}} + + {{else}} + {{flashText}} + {{/if}} +
+{{/if}} -
- -
+{{#d-modal-body title=(if editing "user.invited.invite.edit_title" "user.invited.invite.new_title")}} + + {{#if editing}} +
+ +
+ {{input + name="invite-link" + class="invite-link" + value=invite.link + readonly=true + }} + {{copy-button selector="input.invite-link" copied=(action "copied")}} +
+
+ {{/if}}
@@ -48,66 +67,64 @@
{{/if}} - {{#if showAdvanced}} - {{#if isEmail}} -
- - {{textarea id="invite-message" value=buffered.custom_message}} -
- {{/if}} + {{#if isEmail}} +
+ + {{textarea id="invite-message" value=buffered.custom_message}} +
{{/if}} - {{#if showAdvanced}} - {{#if currentUser.staff}} -
- {{choose-topic - selectedTopicId=buffered.topicId - topicTitle=buffered.topicTitle - additionalFilters="status:public" - labelIcon="hand-point-right" - label="user.invited.invite.invite_to_topic" - }} -
- {{else if buffered.topicTitle}} -
- - {{input - name="invite-topic" - class="invite-topic" - value=buffered.topicTitle - readonly=true - }} -
- {{/if}} + {{#if currentUser.staff}} +
+ {{choose-topic + selectedTopicId=buffered.topicId + topicTitle=buffered.topicTitle + additionalFilters="status:public" + labelIcon="hand-point-right" + label="user.invited.invite.invite_to_topic" + }} +
+ {{else if buffered.topicTitle}} +
+ + {{input + name="invite-topic" + class="invite-topic" + value=buffered.topicTitle + readonly=true + }} +
{{/if}} - {{#if showAdvanced}} - {{#if canInviteToGroup}} -
- - {{group-chooser - content=allGroups - value=buffered.groupIds - labelProperty="name" - onChange=(action (mut buffered.groupIds)) - }} -
- {{/if}} + {{#if canInviteToGroup}} +
+ + {{group-chooser + content=allGroups + value=buffered.groupIds + labelProperty="name" + onChange=(action (mut buffered.groupIds)) + }} +
{{/if}} - {{#if showAdvanced}} - {{#if currentUser.staff}} -
- {{future-date-input - displayLabelIcon="far-clock" - displayLabel=(i18n "user.invited.invite.expires_at") - includeDateTime=true - includeMidFuture=true - clearable=true - onChangeInput=(action (mut buffered.expires_at)) - }} -
- {{/if}} + {{#if currentUser.staff}} +
+ {{future-date-input + displayLabelIcon="far-clock" + displayLabel=(i18n "user.invited.invite.expires_at") + statusType="close" + includeDateTime=true + includeMidFuture=true + clearable=true + input=buffered.expires_at + onChangeInput=(action (mut buffered.expires_at)) + }} +
+ {{else}} +
+ +
{{/if}} {{/d-modal-body}} @@ -120,21 +137,12 @@ action=(action "saveInvite") }} - {{#if isEmail}} - {{d-button - icon="envelope" - label=(if invite.emailed "user.invited.reinvite" "user.invited.invite.send_invite_email") - class="btn-primary send-invite" - action=(action "saveInvite" true) - }} - {{/if}} - - {{#if hasAdvanced}} - {{d-button - action=(action "toggleAdvanced") - class="btn-default show-advanced" - icon="cog" - title=(if showAdvanced "user.invited.invite.hide_advanced" "user.invited.invite.show_advanced") - }} - {{/if}} + {{d-button + icon="envelope" + label=(if invite.emailed "user.invited.reinvite" "user.invited.invite.send_invite_email") + class="btn-primary send-invite" + action=(action "saveInvite" true) + title=(unless isEmail "user.invited.invite.send_invite_email_instructions") + disabled=(not isEmail) + }}
diff --git a/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js index 27d6abfe89..f4e577baab 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js @@ -4,15 +4,12 @@ import { count, exists, fakeTime, - query, queryAll, } from "discourse/tests/helpers/qunit-helpers"; -import { test } from "qunit"; import I18n from "I18n"; +import { test } from "qunit"; acceptance("Invites - Create & Edit Invite Modal", function (needs) { - let deleted; - needs.user(); needs.pretender((server, helper) => { const inviteData = { @@ -42,30 +39,17 @@ acceptance("Invites - Create & Edit Invite Modal", function (needs) { }); server.delete("/invites", () => { - deleted = true; return helper.response({}); }); }); - needs.hooks.beforeEach(() => { - deleted = false; - }); test("basic functionality", async function (assert) { await visit("/u/eviltrout/invited/pending"); await click(".user-invite-buttons .btn:first-child"); - assert.strictEqual( - query("input.invite-link").value, - "http://example.com/invites/52641ae8878790bc7b79916247cfe6ba", - "shows an invite link when modal is opened" - ); - await click(".modal-footer .show-advanced"); - await assert.ok(exists(".invite-to-groups"), "shows advanced options"); - await assert.ok(exists(".invite-to-topic"), "shows advanced options"); - await assert.ok(exists(".invite-expires-at"), "shows advanced options"); - - await click(".modal-close"); - assert.ok(deleted, "deletes the invite if not saved"); + await assert.ok(exists(".invite-to-groups")); + await assert.ok(exists(".invite-to-topic")); + await assert.ok(exists(".invite-expires-at")); }); test("saving", async function (assert) { @@ -81,31 +65,14 @@ acceptance("Invites - Create & Edit Invite Modal", function (needs) { 1, "adds invite to list after saving" ); - - await click(".modal-close"); - assert.notOk(deleted, "does not delete invite on close"); }); test("copying saves invite", async function (assert) { await visit("/u/eviltrout/invited/pending"); await click(".user-invite-buttons .btn:first-child"); - await click(".invite-link .btn"); - - await click(".modal-close"); - assert.notOk(deleted, "does not delete invite on close"); - }); - - test("copying an email invite without an email shows error message", async function (assert) { - await visit("/u/eviltrout/invited/pending"); - await click(".user-invite-buttons .btn:first-child"); - - await fillIn("#invite-email", "error"); - await click(".invite-link .btn"); - assert.strictEqual( - query("#modal-alert").innerText, - "error isn't a valid email address." - ); + await click(".save-invite"); + assert.ok(exists(".invite-link .btn")); }); }); @@ -159,7 +126,10 @@ acceptance("Invites - Email Invites", function (needs) { groups: [], }; - server.post("/invites", () => helper.response(inviteData)); + server.post("/invites", (request) => { + lastRequest = request; + return helper.response(inviteData); + }); server.put("/invites/1", (request) => { lastRequest = request; @@ -232,7 +202,6 @@ acceptance( await visit("/u/eviltrout/invited/pending"); await click(".user-invite-buttons .btn:first-child"); - await click(".modal-footer .show-advanced"); await click(".future-date-input-selector-header"); const options = Array.from( diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss index 14cc953260..396d2c8a1c 100644 --- a/app/assets/stylesheets/common/base/share_link.scss +++ b/app/assets/stylesheets/common/base/share_link.scss @@ -182,9 +182,10 @@ } } - .show-advanced { - margin-left: auto; - margin-right: 0; + .invite-custom-message { + label { + margin-left: 1.75em; + } } .input-group { @@ -198,5 +199,16 @@ margin-left: 1.75em; width: calc(100% - 1.75em); } + + .future-date-input-date-picker, + .future-date-input-time-picker { + display: inline-block; + margin: 0em 0em 0em 1.75em; + width: calc(50% - 2em); + + input { + height: 34px; + } + } } } diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 3c7368df84..c4a54245d2 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -111,6 +111,11 @@ .create-invite-modal, .create-invite-bulk-modal, .share-topic-modal { + &.modal .modal-body { + margin: 1em; + padding: unset; + } + .modal-inner-container { width: 40em; // scale with user font-size max-width: 100vw; // prevent overflow if user font-size is enourmous diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index bb9066166b..7fe17831b6 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1613,7 +1613,7 @@ en: new_title: "Create Invite" edit_title: "Edit Invite" - instructions: "Share this link to instantly grant access to this site" + instructions: "Share this link to instantly grant access to this site:" copy_link: "copy link" expires_in_time: "Expires in %{time}" expired_at_time: "Expired at %{time}" @@ -1621,20 +1621,20 @@ en: show_advanced: "Show Advanced Options" hide_advanced: "Hide Advanced Options" - restrict_email: "Restrict to one email address" + restrict_email: "Restrict to email" max_redemptions_allowed: "Max uses" add_to_groups: "Add to groups" - invite_to_topic: "Arrive at this topic" + invite_to_topic: "Arrive at topic" expires_at: "Expire after" custom_message: "Optional personal message" send_invite_email: "Save and Send Email" + send_invite_email_instructions: "Restrict invite to email to send an invite email" save_invite: "Save Invite" invite_saved: "Invite saved." - invite_copied: "Invite link copied." bulk_invite: none: "No invitations to display on this page." diff --git a/config/site_settings.yml b/config/site_settings.yml index a927de4c5f..a1bad6eab0 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -586,6 +586,7 @@ users: default: true invite_expiry_days: default: 30 + client: true max: 36500 invites_per_page: client: true From 9ebfcbb8670aaa28f27609a55d2bff556697b061 Mon Sep 17 00:00:00 2001 From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com> Date: Thu, 18 Nov 2021 13:32:44 -0600 Subject: [PATCH 020/168] FIX: Topic list separator fix (#15011) --- app/assets/stylesheets/common/base/_topic-list.scss | 2 +- app/assets/stylesheets/desktop/topic-list.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index eb2d7036e0..7480ccf030 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -199,7 +199,7 @@ border: none; .topic-list-data { - border-bottom: 1px solid var(--danger-medium); + border-top: 1px solid var(--danger-medium); line-height: 0em; padding: 0; text-align: center; diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 78346b9e42..ad93fb44a9 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -211,7 +211,7 @@ button.dismiss-read { .topic-list { // tighter table header spacing - .topic-list-data:first-of-type { + .topic-list-item .topic-list-data:first-of-type { padding: 12px 5px; } // smaller table cell spacing From 2c045c636832e6fd1b5b42fa84d1f295fbdc698a Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 17 Nov 2021 15:03:15 -0500 Subject: [PATCH 021/168] FIX: Don't overwrite computed property for loading spinner fix This fixes an issue CvX found on PR #14666 where a previous fix overwrote a computed property. The better fix (as is often the case with Ember) is to remove an observer and call methods when things change ourselves. --- .../discourse/app/controllers/discovery.js | 11 +++++++---- .../discourse/app/controllers/discovery/topics.js | 5 ++--- .../javascripts/discourse/app/routes/discovery.js | 9 ++++----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/discourse/app/controllers/discovery.js b/app/assets/javascripts/discourse/app/controllers/discovery.js index 354465da4e..c06ad44e2b 100644 --- a/app/assets/javascripts/discourse/app/controllers/discovery.js +++ b/app/assets/javascripts/discourse/app/controllers/discovery.js @@ -2,7 +2,6 @@ import Controller, { inject as controller } from "@ember/controller"; import { alias, equal, not } from "@ember/object/computed"; import Category from "discourse/models/category"; import DiscourseURL from "discourse/lib/url"; -import { observes } from "discourse-common/utils/decorators"; import { inject as service } from "@ember/service"; export default Controller.extend({ @@ -14,7 +13,6 @@ export default Controller.extend({ "router.currentRouteName", "discovery.categories" ), - loading: false, category: alias("navigationCategory.category"), @@ -22,8 +20,13 @@ export default Controller.extend({ loadedAllItems: not("discoveryTopics.model.canLoadMore"), - @observes("loadedAllItems") - _showFooter() { + loadingBegan() { + this.set("loading", true); + this.set("application.showFooter", false); + }, + + loadingComplete() { + this.set("loading", false); this.set("application.showFooter", this.loadedAllItems); }, diff --git a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js index b7aefc9587..f19fbdcf22 100644 --- a/app/assets/javascripts/discourse/app/controllers/discovery/topics.js +++ b/app/assets/javascripts/discourse/app/controllers/discovery/topics.js @@ -66,15 +66,14 @@ const controllerOpts = { this.send("resetParams", options.skipResettingParams); // Don't refresh if we're still loading - if (this.get("discovery.loading")) { + if (this.discovery.loading) { return; } // If we `send('loading')` here, due to returning true it bubbles up to the // router and ember throws an error due to missing `handlerInfos`. // Lesson learned: Don't call `loading` yourself. - this.set("discovery.loading", true); - this.set("model.canLoadMore", true); + this.discovery.loadingBegan(); this.topicTrackingState.resetTracking(); diff --git a/app/assets/javascripts/discourse/app/routes/discovery.js b/app/assets/javascripts/discourse/app/routes/discovery.js index a0d2bcc848..c8ab3ad57f 100644 --- a/app/assets/javascripts/discourse/app/routes/discovery.js +++ b/app/assets/javascripts/discourse/app/routes/discovery.js @@ -46,25 +46,24 @@ export default DiscourseRoute.extend(OpenComposer, { actions: { loading() { - this.controllerFor("discovery").set("loading", true); + this.controllerFor("discovery").loadingBegan(); + + // We don't want loading to bubble return true; }, loadingComplete() { - this.controllerFor("discovery").set("loading", false); + this.controllerFor("discovery").loadingComplete(); if (!this.session.get("topicListScrollPosition")) { scrollTop(); } - return false; }, didTransition() { - this.controllerFor("discovery")._showFooter(); this.send("loadingComplete"); const model = this.controllerFor("discovery/topics").get("model"); setTopicList(model); - return false; }, // clear a pinned topic From e6670393df5fb84eebf72deaa9eea07bb8ca6fcc Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 18 Nov 2021 21:49:58 +0100 Subject: [PATCH 022/168] DEV: Refactor `logs-notice`/`global-notice` (#15000) --- .../discourse/app/components/global-notice.js | 280 +++++++++--------- .../inject-discourse-objects.js | 2 +- .../discourse/app/services/logs-notice.js | 37 +-- 3 files changed, 156 insertions(+), 163 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/global-notice.js b/app/assets/javascripts/discourse/app/components/global-notice.js index 82936c7a59..c526bebef2 100644 --- a/app/assets/javascripts/discourse/app/components/global-notice.js +++ b/app/assets/javascripts/discourse/app/components/global-notice.js @@ -1,11 +1,11 @@ -import EmberObject, { computed } from "@ember/object"; +import EmberObject, { action } from "@ember/object"; import cookie, { removeCookie } from "discourse/lib/cookie"; import Component from "@ember/component"; import I18n from "I18n"; -import LogsNotice from "discourse/services/logs-notice"; -import { bind } from "discourse-common/utils/decorators"; +import discourseComputed, { bind } from "discourse-common/utils/decorators"; import getURL from "discourse-common/lib/get-url"; import { htmlSafe } from "@ember/template"; +import { inject as service } from "@ember/service"; const _pluginNotices = []; @@ -48,186 +48,190 @@ const Notice = EmberObject.extend({ }); export default Component.extend({ + logsNoticeService: service("logsNotice"), logNotice: null, init() { this._super(...arguments); - this._setupObservers(); + this.logsNoticeService.addObserver("hidden", this._handleLogsNoticeUpdate); + this.logsNoticeService.addObserver("text", this._handleLogsNoticeUpdate); }, willDestroyElement() { this._super(...arguments); - this._tearDownObservers(); + this.logsNoticeService.removeObserver("text", this._handleLogsNoticeUpdate); + this.logsNoticeService.removeObserver( + "hidden", + this._handleLogsNoticeUpdate + ); }, - notices: computed( + @discourseComputed( "site.isReadOnly", + "site.wizard_required", + "siteSettings.login_required", "siteSettings.disable_emails", - "logNotice.{id,text,hidden}", - function () { - let notices = []; + "siteSettings.global_notice", + "siteSettings.bootstrap_mode_enabled", + "siteSettings.bootstrap_mode_min_users", + "session.safe_mode", + "logNotice.{id,text,hidden}" + ) + notices( + isReadOnly, + wizardRequired, + loginRequired, + disableEmails, + globalNotice, + bootstrapModeEnabled, + bootstrapModeMinUsers, + safeMode, + logNotice + ) { + let notices = []; - if (cookie("dosp") === "1") { - removeCookie("dosp", { path: "/" }); + if (cookie("dosp") === "1") { + removeCookie("dosp", { path: "/" }); + notices.push( + Notice.create({ + text: loginRequired + ? I18n.t("forced_anonymous_login_required") + : I18n.t("forced_anonymous"), + id: "forced-anonymous", + }) + ); + } + + if (safeMode) { + notices.push( + Notice.create({ text: I18n.t("safe_mode.enabled"), id: "safe-mode" }) + ); + } + + if (isReadOnly) { + notices.push( + Notice.create({ + text: I18n.t("read_only_mode.enabled"), + id: "alert-read-only", + }) + ); + } + + if (disableEmails === "yes" || disableEmails === "non-staff") { + notices.push( + Notice.create({ + text: I18n.t("emails_are_disabled"), + id: "alert-emails-disabled", + }) + ); + } + + if (wizardRequired) { + const requiredText = I18n.t("wizard_required", { + url: getURL("/wizard"), + }); + notices.push( + Notice.create({ text: htmlSafe(requiredText), id: "alert-wizard" }) + ); + } + + if (this.currentUser?.staff && bootstrapModeEnabled) { + if (bootstrapModeMinUsers > 0) { notices.push( Notice.create({ - text: this.siteSettings.login_required - ? I18n.t("forced_anonymous_login_required") - : I18n.t("forced_anonymous"), - id: "forced-anonymous", + text: I18n.t("bootstrap_mode_enabled", { + count: bootstrapModeMinUsers, + }), + id: "alert-bootstrap-mode", + }) + ); + } else { + notices.push( + Notice.create({ + text: I18n.t("bootstrap_mode_disabled"), + id: "alert-bootstrap-mode", }) ); } + } - if (this.session && this.session.safe_mode) { - notices.push( - Notice.create({ text: I18n.t("safe_mode.enabled"), id: "safe-mode" }) - ); + if (globalNotice?.length > 0) { + notices.push( + Notice.create({ + text: globalNotice, + id: "alert-global-notice", + }) + ); + } + + if (logNotice) { + notices.push(logNotice); + } + + return notices.concat(_pluginNotices).filter((notice) => { + if (notice.options.visibility) { + return notice.options.visibility(notice); } - if (this.site.isReadOnly) { - notices.push( - Notice.create({ - text: I18n.t("read_only_mode.enabled"), - id: "alert-read-only", - }) - ); + const key = `${GLOBAL_NOTICE_DISMISSED_PROMPT_KEY}-${notice.id}`; + const value = this.keyValueStore.get(key); + + // banner has never been dismissed + if (!value) { + return true; } - if ( - this.siteSettings.disable_emails === "yes" || - this.siteSettings.disable_emails === "non-staff" - ) { - notices.push( - Notice.create({ - text: I18n.t("emails_are_disabled"), - id: "alert-emails-disabled", - }) - ); + // banner has no persistent dismiss and should always show on load + if (!notice.options.persistentDismiss) { + return true; } - if (this.site.wizard_required) { - const requiredText = I18n.t("wizard_required", { - url: getURL("/wizard"), - }); - notices.push( - Notice.create({ text: htmlSafe(requiredText), id: "alert-wizard" }) - ); + if (notice.options.dismissDuration) { + const resetAt = moment(value).add(notice.options.dismissDuration); + return moment().isAfter(resetAt); + } else { + return false; } + }); + }, - if ( - this.get("currentUser.staff") && - this.siteSettings.bootstrap_mode_enabled - ) { - if (this.siteSettings.bootstrap_mode_min_users > 0) { - notices.push( - Notice.create({ - text: I18n.t("bootstrap_mode_enabled", { - count: this.siteSettings.bootstrap_mode_min_users, - }), - id: "alert-bootstrap-mode", - }) - ); - } else { - notices.push( - Notice.create({ - text: I18n.t("bootstrap_mode_disabled"), - id: "alert-bootstrap-mode", - }) - ); - } - } + @action + dismissNotice(notice) { + if (notice.options.onDismiss) { + notice.options.onDismiss(notice); + } - if ( - this.siteSettings.global_notice && - this.siteSettings.global_notice.length - ) { - notices.push( - Notice.create({ - text: this.siteSettings.global_notice, - id: "alert-global-notice", - }) - ); - } - - if (this.logNotice) { - notices.push(this.logNotice); - } - - return notices.concat(_pluginNotices).filter((notice) => { - if (notice.options.visibility) { - return notice.options.visibility(notice); - } else { - const key = `${GLOBAL_NOTICE_DISMISSED_PROMPT_KEY}-${notice.id}`; - const value = this.keyValueStore.get(key); - - // banner has never been dismissed - if (!value) { - return true; - } - - // banner has no persistent dismiss and should always show on load - if (!notice.options.persistentDismiss) { - return true; - } - - if (notice.options.dismissDuration) { - const resetAt = moment(value).add(notice.options.dismissDuration); - return moment().isAfter(resetAt); - } else { - return false; - } - } + if (notice.options.persistentDismiss) { + this.keyValueStore.set({ + key: `${GLOBAL_NOTICE_DISMISSED_PROMPT_KEY}-${notice.id}`, + value: moment().toISOString(true), }); } - ), - actions: { - dismissNotice(notice) { - if (notice.options.onDismiss) { - notice.options.onDismiss(notice); - } - - if (notice.options.persistentDismiss) { - this.keyValueStore.set({ - key: `${GLOBAL_NOTICE_DISMISSED_PROMPT_KEY}-${notice.id}`, - value: moment().toISOString(true), - }); - } - - const alert = document.getElementById(`global-notice-${notice.id}`); - if (alert) { - alert.style.display = "none"; - } - }, - }, - - _setupObservers() { - LogsNotice.current().addObserver("hidden", this._handleLogsNoticeUpdate); - LogsNotice.current().addObserver("text", this._handleLogsNoticeUpdate); - }, - - _tearDownObservers() { - LogsNotice.current().removeObserver("text", this._handleLogsNoticeUpdate); - LogsNotice.current().removeObserver("hidden", this._handleLogsNoticeUpdate); + const alert = document.getElementById(`global-notice-${notice.id}`); + if (alert) { + alert.style.display = "none"; + } }, @bind _handleLogsNoticeUpdate() { const logNotice = Notice.create({ - text: htmlSafe(LogsNotice.currentProp("message")), + text: htmlSafe(this.logsNoticeService.message), id: "alert-logs-notice", options: { dismissable: true, persistentDismiss: false, visibility() { - return !LogsNotice.currentProp("hidden"); + return !this.logsNoticeService.hidden; }, onDismiss() { - LogsNotice.currentProp("hidden", true); - LogsNotice.currentProp("text", ""); + this.logsNoticeService.setProperties({ + hidden: true, + text: "", + }); }, }, }); diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js index 2a92f321fb..a9702e2ce4 100644 --- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js +++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js @@ -98,7 +98,6 @@ export default { app.inject(t, "store", "service:store"); app.inject(t, "site", "site:main"); app.inject(t, "searchService", "service:search"); - app.inject(t, "keyValueStore", "key-value-store:main"); }); ALL_TARGETS.concat("service").forEach((t) => { @@ -106,6 +105,7 @@ export default { app.inject(t, "messageBus", "message-bus:main"); app.inject(t, "siteSettings", "site-settings:main"); app.inject(t, "topicTrackingState", "topic-tracking-state:main"); + app.inject(t, "keyValueStore", "key-value-store:main"); }); if (currentUser) { diff --git a/app/assets/javascripts/discourse/app/services/logs-notice.js b/app/assets/javascripts/discourse/app/services/logs-notice.js index 6c77e7c6b8..2e3143a907 100644 --- a/app/assets/javascripts/discourse/app/services/logs-notice.js +++ b/app/assets/javascripts/discourse/app/services/logs-notice.js @@ -1,22 +1,26 @@ -import discourseComputed, { - observes, - on, -} from "discourse-common/utils/decorators"; -import EmberObject from "@ember/object"; +import discourseComputed, { observes } from "discourse-common/utils/decorators"; +import Service from "@ember/service"; import I18n from "I18n"; import { autoUpdatingRelativeAge } from "discourse/lib/formatter"; import getURL from "discourse-common/lib/get-url"; import { htmlSafe } from "@ember/template"; import { isEmpty } from "@ember/utils"; +import { readOnly } from "@ember/object/computed"; const LOGS_NOTICE_KEY = "logs-notice-text"; -const LogsNotice = EmberObject.extend({ +export default Service.extend({ text: "", - @on("init") - _setup() { - if (!this.isActivated) { + isAdmin: readOnly("currentUser.admin"), + + init() { + this._super(...arguments); + + if ( + this.siteSettings.alert_admins_if_errors_per_hour === 0 && + this.siteSettings.alert_admins_if_errors_per_minute === 0 + ) { return; } @@ -63,11 +67,6 @@ const LogsNotice = EmberObject.extend({ return htmlSafe(text); }, - @discourseComputed("currentUser") - isAdmin(currentUser) { - return currentUser && currentUser.admin; - }, - @discourseComputed("isEmpty", "isAdmin") hidden(thisIsEmpty, isAdmin) { return !isAdmin || thisIsEmpty; @@ -77,14 +76,4 @@ const LogsNotice = EmberObject.extend({ _updateKeyValueStore() { this.keyValueStore.setItem(LOGS_NOTICE_KEY, this.text); }, - - @discourseComputed( - "siteSettings.alert_admins_if_errors_per_hour", - "siteSettings.alert_admins_if_errors_per_minute" - ) - isActivated(errorsPerHour, errorsPerMinute) { - return errorsPerHour > 0 || errorsPerMinute > 0; - }, }); - -export default LogsNotice; From 9955f1774d45eedbffcc64b8ea0e260ea5130187 Mon Sep 17 00:00:00 2001 From: jbrw Date: Thu, 18 Nov 2021 19:24:15 -0500 Subject: [PATCH 023/168] UX: Move share topic warning to modal flash alert (#15012) --- .../discourse/app/controllers/share-topic.js | 44 +++++++++---------- .../app/templates/modal/share-topic.hbs | 6 --- .../tests/acceptance/share-topic-test.js | 2 +- .../stylesheets/common/base/share_link.scss | 5 --- config/locales/client.en.yml | 4 +- 5 files changed, 23 insertions(+), 38 deletions(-) diff --git a/app/assets/javascripts/discourse/app/controllers/share-topic.js b/app/assets/javascripts/discourse/app/controllers/share-topic.js index e3cf0ed5c9..3c54976d9b 100644 --- a/app/assets/javascripts/discourse/app/controllers/share-topic.js +++ b/app/assets/javascripts/discourse/app/controllers/share-topic.js @@ -22,15 +22,7 @@ export default Controller.extend( this.set("showNotifyUsers", false); if (this.model && this.model.read_restricted) { - Category.reloadBySlugPath(this.model.slug).then((result) => { - this.setProperties({ - restrictedGroups: result.category.group_permissions.map( - (g) => g.group_name - ), - }); - }); - } else { - this.setProperties({ restrictedGroups: null }); + this.restrictedGroupWarning(); } }, @@ -55,21 +47,6 @@ export default Controller.extend( ); }, - @discourseComputed("restrictedGroups") - hasRestrictedGroups(groups) { - return !!groups; - }, - - @discourseComputed("restrictedGroups") - restrictedGroupsCount(groups) { - return groups.length; - }, - - @discourseComputed("restrictedGroups") - restrictedGroupsDisplayText(groups) { - return groups.join(", "); - }, - @action onChangeUsers(usernames) { this.set("users", usernames.uniq()); @@ -134,5 +111,24 @@ export default Controller.extend( topicTitle: this.topic.title, }); }, + + restrictedGroupWarning() { + this.appEvents.on("modal:body-shown", () => { + let restrictedGroups; + Category.reloadBySlugPath(this.model.slug).then((result) => { + restrictedGroups = result.category.group_permissions.map( + (g) => g.group_name + ); + + if (restrictedGroups) { + const message = I18n.t("topic.share.restricted_groups", { + count: restrictedGroups.length, + groupNames: restrictedGroups.join(", "), + }); + this.flash(message, "warning"); + } + }); + }); + }, } ); diff --git a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs index ff2de50714..330637850b 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs @@ -13,12 +13,6 @@ - {{#if hasRestrictedGroups}} -
- {{i18n "topic.share.restricted_groups" count=restrictedGroupsCount}} - {{restrictedGroupsDisplayText}} -
- {{/if}}
{{#each sources as |s|}} diff --git a/app/assets/javascripts/discourse/tests/acceptance/share-topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/share-topic-test.js index 3446b53f2a..21f6373f5b 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/share-topic-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/share-topic-test.js @@ -61,7 +61,7 @@ acceptance("Share and Invite modal", function (needs) { assert.ok(exists(".share-topic-modal"), "it shows the modal"); assert.ok( - exists(".link-share-restricted-groups"), + exists("#modal-alert.alert-warning"), "it shows restricted warning" ); }); diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss index 396d2c8a1c..9a830ea371 100644 --- a/app/assets/stylesheets/common/base/share_link.scss +++ b/app/assets/stylesheets/common/base/share_link.scss @@ -13,11 +13,6 @@ } } -.link-share-restricted-groups { - margin-top: 0.5em; - color: var(--danger-medium); -} - .link-share-actions { display: flex; flex-wrap: wrap; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 7fe17831b6..3b275eab94 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2832,8 +2832,8 @@ en: instructions: "Share a link to this topic:" copied: "Topic link copied." restricted_groups: - one: "Only visible to members of group:" - other: "Only visible to members of groups:" + one: "Only visible to members of group: %{groupNames}" + other: "Only visible to members of groups: %{groupNames}" notify_users: title: "Notify" instructions: "Notify the following users about this topic:" From 254689b1fbf51fd432b5f33c4740615c5a667563 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 19 Nov 2021 01:09:36 +0000 Subject: [PATCH 024/168] DEV: Remove JQuery from discourse/lib/text-direction (#15014) --- .../app/initializers/post-decorations.js | 2 +- .../discourse/app/lib/text-direction.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/discourse/app/initializers/post-decorations.js b/app/assets/javascripts/discourse/app/initializers/post-decorations.js index 5b04730dd0..ee0290bf5e 100644 --- a/app/assets/javascripts/discourse/app/initializers/post-decorations.js +++ b/app/assets/javascripts/discourse/app/initializers/post-decorations.js @@ -32,7 +32,7 @@ export default { ); api.decorateCookedElement(lightbox, { id: "discourse-lightbox" }); if (siteSettings.support_mixed_text_direction) { - api.decorateCooked(setTextDirections, { + api.decorateCookedElement(setTextDirections, { id: "discourse-text-direction", }); } diff --git a/app/assets/javascripts/discourse/app/lib/text-direction.js b/app/assets/javascripts/discourse/app/lib/text-direction.js index b3da0964b6..9c01d1d3fa 100644 --- a/app/assets/javascripts/discourse/app/lib/text-direction.js +++ b/app/assets/javascripts/discourse/app/lib/text-direction.js @@ -13,19 +13,19 @@ export function isLTR(text) { return ltrDirCheck.test(text); } -export function setTextDirections($elem) { - $elem.find("*").each((i, e) => { - let $e = $(e), - textContent = $e.text(); - if (textContent) { - isRTL(textContent) ? $e.attr("dir", "rtl") : $e.attr("dir", "ltr"); +export function setTextDirections(elem) { + for (let e of elem.children) { + if (e.textContent) { + e.setAttribute("dir", isRTL(e.textContent) ? "rtl" : "ltr"); } - }); + } } export function siteDir() { if (!_siteDir) { - _siteDir = $("html").hasClass("rtl") ? "rtl" : "ltr"; + _siteDir = document.documentElement.classList.contains("rtl") + ? "rtl" + : "ltr"; } return _siteDir; } From 1d0faedfbc3a8b77b971dc70d25e30791dbb6e0b Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Fri, 19 Nov 2021 09:50:08 +0800 Subject: [PATCH 025/168] FIX: Validate number of votes allowed per poll per user. (#15001) * DEV: Remove spec that we no longer need. As far as we know, the migration has been successful for a number of years. * FIX: Validate number of votes allowed per poll per user. --- plugins/poll/config/locales/server.en.yml | 7 + plugins/poll/lib/poll.rb | 44 ++- .../post_migrate/migrate_polls_data_spec.rb | 333 ------------------ .../spec/integration/poll_endpoints_spec.rb | 31 +- plugins/poll/spec/lib/poll_spec.rb | 131 +++++++ 5 files changed, 207 insertions(+), 339 deletions(-) delete mode 100644 plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb create mode 100644 plugins/poll/spec/lib/poll_spec.rb diff --git a/plugins/poll/config/locales/server.en.yml b/plugins/poll/config/locales/server.en.yml index 58e121d5d3..19bedc3903 100644 --- a/plugins/poll/config/locales/server.en.yml +++ b/plugins/poll/config/locales/server.en.yml @@ -47,6 +47,13 @@ en: topic_must_be_open_to_vote: "The topic must be open to vote." poll_must_be_open_to_vote: "Poll must be open to vote." + one_vote_per_user: "Only 1 vote is allowed for this poll." + max_vote_per_user: + one: Only %{count} vote is allowed for this poll. + other: A maximum of %{count} votes is allowed for this poll. + min_vote_per_user: + one: A minimum of %{count} vote is required for this poll. + other: A minimum of %{count} votes is required for this poll. topic_must_be_open_to_toggle_status: "The topic must be open to toggle status." only_staff_or_op_can_toggle_status: "Only a staff member or the original poster can toggle a poll status." diff --git a/plugins/poll/lib/poll.rb b/plugins/poll/lib/poll.rb index fba328e5f6..fceefc090b 100644 --- a/plugins/poll/lib/poll.rb +++ b/plugins/poll/lib/poll.rb @@ -2,7 +2,10 @@ class DiscoursePoll::Poll def self.vote(user, post_id, poll_name, options) + poll_id = nil + serialized_poll = DiscoursePoll::Poll.change_vote(user, post_id, poll_name) do |poll| + poll_id = poll.id # remove options that aren't available in the poll available_options = poll.poll_options.map { |o| o.digest }.to_set options.select! { |o| available_options.include?(o) } @@ -13,6 +16,8 @@ class DiscoursePoll::Poll obj << option.id if options.include?(option.digest) end + self.validate_votes!(poll, new_option_ids) + old_option_ids = poll.poll_options.each_with_object([]) do |option, obj| if option.poll_votes.where(user_id: user.id).exists? obj << option.id @@ -31,6 +36,24 @@ class DiscoursePoll::Poll end end + # Ensure consistency here as we do not have a unique index to limit the + # number of votes per the poll's configuration. + DB.query(<<~SQL, poll_id: poll_id, user_id: user.id, offset: serialized_poll[:type] == "multiple" ? serialized_poll[:max] : 1) + DELETE FROM poll_votes + USING ( + SELECT + poll_id, + user_id + FROM poll_votes + WHERE poll_id = :poll_id + AND user_id = :user_id + ORDER BY created_at DESC + OFFSET :offset + ) to_delete_poll_votes + WHERE poll_votes.poll_id = to_delete_poll_votes.poll_id + AND poll_votes.user_id = to_delete_poll_votes.user_id + SQL + [serialized_poll, options] end @@ -288,7 +311,26 @@ class DiscoursePoll::Poll end end - private + def self.validate_votes!(poll, options) + num_of_options = options.length + + if poll.multiple? + if num_of_options < poll.min + raise DiscoursePoll::Error.new(I18n.t( + "poll.min_vote_per_user", + count: poll.min + )) + elsif num_of_options > poll.max + raise DiscoursePoll::Error.new(I18n.t( + "poll.max_vote_per_user", + count: poll.max + )) + end + elsif num_of_options > 1 + raise DiscoursePoll::Error.new(I18n.t("poll.one_vote_per_user")) + end + end + private_class_method :validate_votes! def self.change_vote(user, post_id, poll_name) Poll.transaction do diff --git a/plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb b/plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb deleted file mode 100644 index a22e819dd7..0000000000 --- a/plugins/poll/spec/db/post_migrate/migrate_polls_data_spec.rb +++ /dev/null @@ -1,333 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' -require_relative '../../../db/migrate/20180820080623_migrate_polls_data' - -RSpec.describe MigratePollsData do - let!(:user) { Fabricate(:user, id: 1) } - let!(:user2) { Fabricate(:user, id: 2) } - let!(:user3) { Fabricate(:user, id: 3) } - let!(:user4) { Fabricate(:user, id: 4) } - let!(:user5) { Fabricate(:user, id: 5) } - let(:post) { Fabricate(:post, user: user) } - - describe 'for a number poll' do - before do - post.custom_fields = { - "polls" => { - "poll" => { - "options" => [ - { "id" => "4d8a15e3cc35750f016ce15a43937620", "html" => "1", "votes" => 0 }, - { "id" => "aa2393b424f2f395abb63bf785760a3b", "html" => "4", "votes" => 0 }, - { "id" => "9ab1070dec27185440cdabb4948a5e9a", "html" => "7", "votes" => 1 }, - { "id" => "46c01f638a50d86e020f47469733b8be", "html" => "10", "votes" => 0 }, - { "id" => "b4f15431e07443c372d521e4ed131abe", "html" => "13", "votes" => 0 }, - { "id" => "4e885ead68ff4456f102843df9fbbd7f", "html" => "16", "votes" => 0 }, - { "id" => "eb8661f072794ea57baa7827cd8ffc88", "html" => "19", "votes" => 0 } - ], - "voters" => 1, - "name" => "poll", - "status" => "open", - "type" => "number", - "min" => "1", - "max" => "20", - "step" => "3" - }, - }, - "polls-votes" => { - "1" => { - "poll" => [ - "9ab1070dec27185440cdabb4948a5e9a" - ] - } - } - } - - post.save_custom_fields - end - - it "should migrate the data correctly" do - expect do - silence_stdout { MigratePollsData.new.up } - end.to \ - change { Poll.count }.by(1) & - change { PollOption.count }.by(7) & - change { PollVote.count }.by(1) - - poll = Poll.find_by(name: "poll", post: post) - - expect(poll.close_at).to eq(nil) - - expect(poll.number?).to eq(true) - expect(poll.open?).to eq(true) - expect(poll.always?).to eq(true) - expect(poll.secret?).to eq(true) - - expect(poll.min).to eq(1) - expect(poll.max).to eq(20) - expect(poll.step).to eq(3) - - expect(PollOption.all.pluck(:digest, :html)).to eq([ - ["4d8a15e3cc35750f016ce15a43937620", "1"], - ["aa2393b424f2f395abb63bf785760a3b", "4"], - ["9ab1070dec27185440cdabb4948a5e9a", "7"], - ["46c01f638a50d86e020f47469733b8be", "10"], - ["b4f15431e07443c372d521e4ed131abe", "13"], - ["4e885ead68ff4456f102843df9fbbd7f", "16"], - ["eb8661f072794ea57baa7827cd8ffc88", "19"] - ]) - - poll_vote = PollVote.first - - expect(poll_vote.poll).to eq(poll) - expect(poll_vote.poll_option.html).to eq("7") - expect(poll_vote.user).to eq(user) - end - end - - describe 'for a multiple poll' do - before do - post.custom_fields = { - "polls-votes" => { - "1" => { - "testing" => [ - "b2c3e3668a886d09e97e38b8adde7d45", - "b2c3e3668a886d09e97e38b8adde7d45", - "28df49fa9e9c09d3a1eb8cfbcdcda7790" - ] - }, - "2" => { - "testing" => [ - "b2c3e3668a886d09e97e38b8adde7d45", - "d01af008ec373e948c0ab3ad61009f35", - ] - }, - }, - "polls" => { - "poll" => { - "options" => [ - { - "id" => "b2c3e3668a886d09e97e38b8adde7d45", - "html" => "Choice 1", - "votes" => 2, - "voter_ids" => [user.id, user2.id] - }, - { - "id" => "28df49fa9e9c09d3a1eb8cfbcdcda7790", - "html" => "Choice 2", - "votes" => 1, - "voter_ids" => [user.id] - }, - { - "id" => "d01af008ec373e948c0ab3ad61009f35", - "html" => "Choice 3", - "votes" => 1, - "voter_ids" => [user2.id] - }, - ], - "voters" => 4, - "name" => "testing", - "status" => "closed", - "type" => "multiple", - "public" => "true", - "min" => 1, - "max" => 2 - } - } - } - - post.save_custom_fields - end - - it 'should migrate the data correctly' do - expect do - silence_stdout { MigratePollsData.new.up } - end.to \ - change { Poll.count }.by(1) & - change { PollOption.count }.by(3) & - change { PollVote.count }.by(4) - - poll = Poll.last - - expect(poll.post_id).to eq(post.id) - expect(poll.name).to eq("testing") - expect(poll.close_at).to eq(nil) - - expect(poll.multiple?).to eq(true) - expect(poll.closed?).to eq(true) - expect(poll.always?).to eq(true) - expect(poll.everyone?).to eq(true) - - expect(poll.min).to eq(1) - expect(poll.max).to eq(2) - expect(poll.step).to eq(nil) - - poll_options = PollOption.all - - poll_option_1 = poll_options[0] - expect(poll_option_1.poll_id).to eq(poll.id) - expect(poll_option_1.digest).to eq("b2c3e3668a886d09e97e38b8adde7d45") - expect(poll_option_1.html).to eq("Choice 1") - - poll_option_2 = poll_options[1] - expect(poll_option_2.poll_id).to eq(poll.id) - expect(poll_option_2.digest).to eq("28df49fa9e9c09d3a1eb8cfbcdcda7790") - expect(poll_option_2.html).to eq("Choice 2") - - poll_option_3 = poll_options[2] - expect(poll_option_3.poll_id).to eq(poll.id) - expect(poll_option_3.digest).to eq("d01af008ec373e948c0ab3ad61009f35") - expect(poll_option_3.html).to eq("Choice 3") - - expect(PollVote.all.pluck(:poll_id).uniq).to eq([poll.id]) - - { - user => [poll_option_1, poll_option_2], - user2 => [poll_option_1, poll_option_3] - }.each do |user, options| - options.each do |option| - expect(PollVote.exists?(poll_option_id: option.id, user_id: user.id)) - .to eq(true) - end - end - end - end - - describe 'for a regular poll' do - before do - post.custom_fields = { - "polls" => { - "testing" => { - "options" => [ - { - "id" => "e94c09aae2aa071610212a5c5042111b", - "html" => "Yes", - "votes" => 0, - "anonymous_votes" => 1, - "voter_ids" => [] - }, - { - "id" => "802c50392a68e426d4b26d81ddc5ab33", - "html" => "No", - "votes" => 0, - "anonymous_votes" => 2, - "voter_ids" => [] - } - ], - "voters" => 0, - "anonymous_voters" => 3, - "name" => "testing", - "status" => "open", - "type" => "regular" - }, - "poll" => { - "options" => [ - { - "id" => "edeee5dae4802ab24185d41039efb545", - "html" => "Yes", - "votes" => 2, - "voter_ids" => [1, 2] - }, - { - "id" => "38d8e35c8fc80590f836f22189064835", - "html" => - "No", - "votes" => 3, - "voter_ids" => [3, 4, 5] - } - ], - "voters" => 5, - "name" => "poll", - "status" => "open", - "type" => "regular", - "public" => "true", - "close" => "2018-10-08T00:00:00.000Z" - }, - }, - "polls-votes" => { - "1" => { "poll" => ["edeee5dae4802ab24185d41039efb545"] }, - "2" => { "poll" => ["edeee5dae4802ab24185d41039efb545"] }, - "3" => { "poll" => ["38d8e35c8fc80590f836f22189064835"] }, - "4" => { "poll" => ["38d8e35c8fc80590f836f22189064835"] }, - "5" => { "poll" => ["38d8e35c8fc80590f836f22189064835"] } - } - } - - post.save_custom_fields - end - - it 'should migrate the data correctly' do - expect do - silence_stdout { MigratePollsData.new.up } - end.to \ - change { Poll.count }.by(2) & - change { PollOption.count }.by(4) & - change { PollVote.count }.by(5) - - poll = Poll.find_by(name: "poll") - - expect(poll.post_id).to eq(post.id) - expect(poll.close_at).to eq_time(Time.parse("2018-10-08T00:00:00.000Z")) - - expect(poll.regular?).to eq(true) - expect(poll.open?).to eq(true) - expect(poll.always?).to eq(true) - expect(poll.everyone?).to eq(true) - - expect(poll.min).to eq(nil) - expect(poll.max).to eq(nil) - expect(poll.step).to eq(nil) - - poll_options = PollOption.where(poll_id: poll.id).to_a - expect(poll_options.size).to eq(2) - - option_1 = poll_options.first - expect(option_1.digest).to eq("edeee5dae4802ab24185d41039efb545") - expect(option_1.html).to eq("Yes") - - option_2 = poll_options.last - expect(option_2.digest).to eq("38d8e35c8fc80590f836f22189064835") - expect(option_2.html).to eq("No") - - expect(PollVote.pluck(:poll_id).uniq).to eq([poll.id]) - - [user, user2].each do |user| - expect(PollVote.exists?(poll_option_id: option_1.id, user_id: user.id)) - .to eq(true) - end - - [user3, user4, user5].each do |user| - expect(PollVote.exists?(poll_option_id: option_2.id, user_id: user.id)) - .to eq(true) - end - - poll = Poll.find_by(name: "testing") - - expect(poll.post_id).to eq(post.id) - expect(poll.close_at).to eq(nil) - expect(poll.anonymous_voters).to eq(3) - - expect(poll.regular?).to eq(true) - expect(poll.open?).to eq(true) - expect(poll.always?).to eq(true) - expect(poll.secret?).to eq(true) - - expect(poll.min).to eq(nil) - expect(poll.max).to eq(nil) - expect(poll.step).to eq(nil) - - poll_options = PollOption.where(poll: poll).to_a - expect(poll_options.size).to eq(2) - - option_1 = poll_options.first - expect(option_1.digest).to eq("e94c09aae2aa071610212a5c5042111b") - expect(option_1.html).to eq("Yes") - expect(option_1.anonymous_votes).to eq(1) - - option_2 = poll_options.last - expect(option_2.digest).to eq("802c50392a68e426d4b26d81ddc5ab33") - expect(option_2.html).to eq("No") - expect(option_2.anonymous_votes).to eq(2) - end - end -end diff --git a/plugins/poll/spec/integration/poll_endpoints_spec.rb b/plugins/poll/spec/integration/poll_endpoints_spec.rb index 61e1e8b5f5..68eb963c9e 100644 --- a/plugins/poll/spec/integration/poll_endpoints_spec.rb +++ b/plugins/poll/spec/integration/poll_endpoints_spec.rb @@ -4,8 +4,19 @@ require "rails_helper" describe "DiscoursePoll endpoints" do describe "fetch voters for a poll" do - let(:user) { Fabricate(:user) } - let(:post) { Fabricate(:post, raw: "[poll public=true]\n- A\n- B\n[/poll]") } + fab!(:user) { Fabricate(:user) } + fab!(:post) { Fabricate(:post, raw: "[poll public=true]\n- A\n- B\n[/poll]") } + + fab!(:post_with_multiple_poll) do + Fabricate(:post, raw: <<~SQL) + [poll type=multiple public=true min=1 max=2] + - A + - B + - C + [/poll] + SQL + end + let(:option_a) { "5c24fc1df56d764b550ceae1b9319125" } let(:option_b) { "e89dec30bbd9bf50fabf6a05b4324edf" } @@ -35,13 +46,13 @@ describe "DiscoursePoll endpoints" do it 'should return the right response for a single option' do DiscoursePoll::Poll.vote( user, - post.id, + post_with_multiple_poll.id, DiscoursePoll::DEFAULT_POLL_NAME, [option_a, option_b] ) get "/polls/voters.json", params: { - post_id: post.id, + post_id: post_with_multiple_poll.id, poll_name: DiscoursePoll::DEFAULT_POLL_NAME, option_id: option_b } @@ -125,7 +136,16 @@ describe "DiscoursePoll endpoints" do fab!(:user2) { Fabricate(:user) } fab!(:user3) { Fabricate(:user) } fab!(:user4) { Fabricate(:user) } - fab!(:post) { Fabricate(:post, raw: "[poll public=true]\n- A\n- B\n[/poll]") } + + fab!(:post) do + Fabricate(:post, raw: <<~SQL) + [poll type=multiple public=true min=1 max=2] + - A + - B + [/poll] + SQL + end + let(:option_a) { "5c24fc1df56d764b550ceae1b9319125" } let(:option_b) { "e89dec30bbd9bf50fabf6a05b4324edf" } @@ -135,6 +155,7 @@ describe "DiscoursePoll endpoints" do user_1: option_a, user_2: option_b, } + [user1, user2, user3].each_with_index do |user, index| DiscoursePoll::Poll.vote( user, diff --git a/plugins/poll/spec/lib/poll_spec.rb b/plugins/poll/spec/lib/poll_spec.rb new file mode 100644 index 0000000000..92740546c0 --- /dev/null +++ b/plugins/poll/spec/lib/poll_spec.rb @@ -0,0 +1,131 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe DiscoursePoll::Poll do + fab!(:user) { Fabricate(:user) } + fab!(:user_2) { Fabricate(:user) } + + fab!(:post_with_regular_poll) do + Fabricate(:post, raw: <<~RAW) + [poll] + * 1 + * 2 + [/poll] + RAW + end + + fab!(:post_with_multiple_poll) do + Fabricate(:post, raw: <<~RAW) + [poll type=multiple min=2 max=3] + * 1 + * 2 + * 3 + * 4 + * 5 + [/poll] + RAW + end + + describe '.vote' do + it 'should only allow one vote per user for a regular poll' do + poll = post_with_regular_poll.polls.first + + expect do + DiscoursePoll::Poll.vote( + user, + post_with_regular_poll.id, + "poll", + poll.poll_options.map(&:digest) + ) + end.to raise_error(DiscoursePoll::Error, I18n.t("poll.one_vote_per_user")) + end + + it 'should clean up bad votes for a regular poll' do + poll = post_with_regular_poll.polls.first + + PollVote.create!( + poll: poll, + poll_option: poll.poll_options.first, + user: user + ) + + PollVote.create!( + poll: poll, + poll_option: poll.poll_options.last, + user: user + ) + + DiscoursePoll::Poll.vote( + user, + post_with_regular_poll.id, + "poll", + [poll.poll_options.first.digest] + ) + + expect(PollVote.where(poll: poll, user: user).pluck(:poll_option_id)) + .to contain_exactly(poll.poll_options.first.id) + end + + it 'allows user to vote on multiple options correctly for a multiple poll' do + poll = post_with_multiple_poll.polls.first + poll_options = poll.poll_options + + [ + poll_options.first, + poll_options.second, + poll_options.third, + ].each do |poll_option| + PollVote.create!(poll: poll, poll_option: poll_option, user: user) + end + + DiscoursePoll::Poll.vote( + user, + post_with_multiple_poll.id, + "poll", + [poll_options.first.digest, poll_options.second.digest] + ) + + DiscoursePoll::Poll.vote( + user_2, + post_with_multiple_poll.id, + "poll", + [poll_options.third.digest, poll_options.fourth.digest] + ) + + expect(PollVote.where(poll: poll, user: user).pluck(:poll_option_id)) + .to contain_exactly(poll_options.first.id, poll_options.second.id) + + expect(PollVote.where(poll: poll, user: user_2).pluck(:poll_option_id)) + .to contain_exactly(poll_options.third.id, poll_options.fourth.id) + end + + it 'should respect the min/max votes per user for a multiple poll' do + poll = post_with_multiple_poll.polls.first + + expect do + DiscoursePoll::Poll.vote( + user, + post_with_multiple_poll.id, + "poll", + poll.poll_options.map(&:digest) + ) + end.to raise_error( + DiscoursePoll::Error, + I18n.t("poll.max_vote_per_user", count: poll.max) + ) + + expect do + DiscoursePoll::Poll.vote( + user, + post_with_multiple_poll.id, + "poll", + [poll.poll_options.first.digest] + ) + end.to raise_error( + DiscoursePoll::Error, + I18n.t("poll.min_vote_per_user", count: poll.min) + ) + end + end +end From da9a9a8e6580f9a2342739c0d51cd79afb3f89a7 Mon Sep 17 00:00:00 2001 From: Natalie Tay Date: Fri, 19 Nov 2021 10:57:09 +0800 Subject: [PATCH 026/168] FIX: Add a confirm and cancel button when editing alt text (#15003) --- .../app/components/composer-editor.js | 102 +++-- .../acceptance/composer-image-preview-test.js | 362 ++++++++++++++++++ .../tests/acceptance/composer-test.js | 284 +------------- .../discourse-markdown/image-controls.js | 53 ++- app/assets/stylesheets/common/d-editor.scss | 52 ++- 5 files changed, 527 insertions(+), 326 deletions(-) create mode 100644 app/assets/javascripts/discourse/tests/acceptance/composer-image-preview-test.js diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js index fe511fd6f2..548556785f 100644 --- a/app/assets/javascripts/discourse/app/components/composer-editor.js +++ b/app/assets/javascripts/discourse/app/components/composer-editor.js @@ -677,6 +677,37 @@ export default Component.extend(ComposerUpload, { return; }, + resetImageControls(buttonWrapper) { + const imageResize = buttonWrapper.querySelector(".scale-btn-container"); + const readonlyContainer = buttonWrapper.querySelector( + ".alt-text-readonly-container" + ); + const editContainer = buttonWrapper.querySelector( + ".alt-text-edit-container" + ); + + imageResize.removeAttribute("hidden"); + readonlyContainer.removeAttribute("hidden"); + editContainer.setAttribute("hidden", "true"); + }, + + commitAltText(buttonWrapper) { + const index = parseInt(buttonWrapper.getAttribute("data-image-index"), 10); + const matchingPlaceholder = this.get("composer.reply").match( + IMAGE_MARKDOWN_REGEX + ); + const match = matchingPlaceholder[index]; + const input = buttonWrapper.querySelector("input.alt-text-input"); + const replacement = match.replace( + IMAGE_MARKDOWN_REGEX, + `![${input.value}|$2$3$4]($5)` + ); + + this.appEvents.trigger("composer:replace-text", match, replacement); + + this.resetImageControls(buttonWrapper); + }, + @bind _handleAltTextInputKeypress(event) { if (!event.target.classList.contains("alt-text-input")) { @@ -688,29 +719,8 @@ export default Component.extend(ComposerUpload, { } if (event.key === "Enter") { - const index = parseInt( - $(event.target).closest(".button-wrapper").attr("data-image-index"), - 10 - ); - const matchingPlaceholder = this.get("composer.reply").match( - IMAGE_MARKDOWN_REGEX - ); - const match = matchingPlaceholder[index]; - const replacement = match.replace( - IMAGE_MARKDOWN_REGEX, - `![${$(event.target).val()}|$2$3$4]($5)` - ); - - this.appEvents.trigger("composer:replace-text", match, replacement); - - const parentContainer = $(event.target).closest( - ".alt-text-readonly-container" - ); - const altText = parentContainer.find(".alt-text"); - const altTextButton = parentContainer.find(".alt-text-edit-btn"); - altText.show(); - altTextButton.show(); - $(event.target).hide(); + const buttonWrapper = event.target.closest(".button-wrapper"); + this.commitAltText(buttonWrapper); } }, @@ -720,21 +730,51 @@ export default Component.extend(ComposerUpload, { return; } - const parentContainer = $(event.target).closest( + const buttonWrapper = event.target.closest(".button-wrapper"); + const imageResize = buttonWrapper.querySelector(".scale-btn-container"); + + const readonlyContainer = buttonWrapper.querySelector( ".alt-text-readonly-container" ); - const altText = parentContainer.find(".alt-text"); - const correspondingInput = parentContainer.find(".alt-text-input"); + const altText = readonlyContainer.querySelector(".alt-text"); - $(event.target).hide(); - altText.hide(); - correspondingInput.val(altText.text()); - correspondingInput.show(); + const editContainer = buttonWrapper.querySelector( + ".alt-text-edit-container" + ); + const editContainerInput = editContainer.querySelector(".alt-text-input"); + + imageResize.setAttribute("hidden", "true"); + readonlyContainer.setAttribute("hidden", "true"); + editContainerInput.value = altText.textContent; + editContainer.removeAttribute("hidden"); + editContainerInput.focus(); event.preventDefault(); }, + @bind + _handleAltTextOkButtonClick(event) { + if (!event.target.classList.contains("alt-text-edit-ok")) { + return; + } + + const buttonWrapper = event.target.closest(".button-wrapper"); + this.commitAltText(buttonWrapper); + }, + + @bind + _handleAltTextCancelButtonClick(event) { + if (!event.target.classList.contains("alt-text-edit-cancel")) { + return; + } + + const buttonWrapper = event.target.closest(".button-wrapper"); + this.resetImageControls(buttonWrapper); + }, + _registerImageAltTextButtonClick(preview) { preview.addEventListener("click", this._handleAltTextEditButtonClick); + preview.addEventListener("click", this._handleAltTextOkButtonClick); + preview.addEventListener("click", this._handleAltTextCancelButtonClick); preview.addEventListener("keypress", this._handleAltTextInputKeypress); }, @@ -766,6 +806,8 @@ export default Component.extend(ComposerUpload, { const preview = this.element.querySelector(".d-editor-preview-wrapper"); preview?.removeEventListener("click", this._handleImageScaleButtonClick); preview?.removeEventListener("click", this._handleAltTextEditButtonClick); + preview?.removeEventListener("click", this._handleAltTextOkButtonClick); + preview?.removeEventListener("click", this._handleAltTextCancelButtonClick); preview?.removeEventListener("keypress", this._handleAltTextInputKeypress); }, diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-image-preview-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-image-preview-test.js new file mode 100644 index 0000000000..b5148fa888 --- /dev/null +++ b/app/assets/javascripts/discourse/tests/acceptance/composer-image-preview-test.js @@ -0,0 +1,362 @@ +import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers"; +import { + acceptance, + count, + exists, + invisible, + query, + queryAll, + visible, +} from "discourse/tests/helpers/qunit-helpers"; +import { test } from "qunit"; + +acceptance("Composer - Image Preview", function (needs) { + needs.user(); + needs.settings({ enable_whispers: true }); + needs.site({ can_tag_topics: true }); + needs.pretender((server, helper) => { + server.post("/uploads/lookup-urls", () => { + return helper.response([]); + }); + server.get("/posts/419", () => { + return helper.response({ id: 419 }); + }); + server.get("/u/is_local_username", () => { + return helper.response({ + valid: [], + valid_groups: ["staff"], + mentionable_groups: [{ name: "staff", user_count: 30 }], + cannot_see: [], + max_users_notified_per_group_mention: 100, + }); + }); + }); + + const assertImageResized = (assert, uploads) => { + assert.strictEqual( + queryAll(".d-editor-input").val(), + uploads.join("\n"), + "it resizes uploaded image" + ); + }; + + test("Image resizing buttons", async function (assert) { + await visit("/"); + await click("#create-topic"); + + let uploads = [ + // 0 Default markdown with dimensions- should work + "![test|690x313](upload://test.png)", + // 1 Image with scaling percentage, should work + "![test|690x313,50%](upload://test.png)", + // 2 image with scaling percentage and a proceeding whitespace, should work + "![test|690x313, 50%](upload://test.png)", + // 3 No dimensions, should not work + "![test](upload://test.jpeg)", + // 4 Wrapped in backticks should not work + "`![test|690x313](upload://test.png)`", + // 5 html image - should not work + "", + // 6 two images one the same line, but both are syntactically correct - both should work + "![onTheSameLine1|200x200](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250](upload://onTheSameLine2.jpeg)", + // 7 & 8 Identical images - both should work + "![identicalImage|300x300](upload://identicalImage.png)", + "![identicalImage|300x300](upload://identicalImage.png)", + // 9 Image with whitespaces in alt - should work + "![image with spaces in alt|690x220](upload://test.png)", + // 10 Image with markdown title - should work + `![image|690x220](upload://test.png "image title")`, + // 11 bbcode - should not work + "[img]/images/avatar.png[/img]", + // 12 Image with data attributes + "![test|foo=bar|690x313,50%|bar=baz](upload://test.png)", + ]; + + await fillIn(".d-editor-input", uploads.join("\n")); + + assert.strictEqual( + count(".button-wrapper"), + 10, + "it adds correct amount of scaling button groups" + ); + + // Default + uploads[0] = + "![test|690x313, 50%](upload://test.png)"; + await click( + queryAll( + ".button-wrapper[data-image-index='0'] .scale-btn[data-scale='50']" + )[0] + ); + assertImageResized(assert, uploads); + + // Targets the correct image if two on the same line + uploads[6] = + "![onTheSameLine1|200x200, 50%](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250](upload://onTheSameLine2.jpeg)"; + await click( + queryAll( + ".button-wrapper[data-image-index='3'] .scale-btn[data-scale='50']" + )[0] + ); + assertImageResized(assert, uploads); + + // Try the other image on the same line + uploads[6] = + "![onTheSameLine1|200x200, 50%](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250, 75%](upload://onTheSameLine2.jpeg)"; + await click( + queryAll( + ".button-wrapper[data-image-index='4'] .scale-btn[data-scale='75']" + )[0] + ); + assertImageResized(assert, uploads); + + // Make sure we target the correct image if there are duplicates + uploads[7] = "![identicalImage|300x300, 50%](upload://identicalImage.png)"; + await click( + queryAll( + ".button-wrapper[data-image-index='5'] .scale-btn[data-scale='50']" + )[0] + ); + assertImageResized(assert, uploads); + + // Try the other dupe + uploads[8] = "![identicalImage|300x300, 75%](upload://identicalImage.png)"; + await click( + queryAll( + ".button-wrapper[data-image-index='6'] .scale-btn[data-scale='75']" + )[0] + ); + assertImageResized(assert, uploads); + + // Don't mess with image titles + uploads[10] = `![image|690x220, 75%](upload://test.png "image title")`; + await click( + queryAll( + ".button-wrapper[data-image-index='8'] .scale-btn[data-scale='75']" + )[0] + ); + assertImageResized(assert, uploads); + + // Keep data attributes + uploads[12] = `![test|foo=bar|690x313, 75%|bar=baz](upload://test.png)`; + await click( + queryAll( + ".button-wrapper[data-image-index='9'] .scale-btn[data-scale='75']" + )[0] + ); + assertImageResized(assert, uploads); + + await fillIn( + ".d-editor-input", + ` +![test|690x313](upload://test.png) + +\`\` + ` + ); + + assert.ok( + !exists("script"), + "it does not unescape script tags in code blocks" + ); + }); + + test("Editing alt text (with enter key) for single image in preview updates alt text in composer", async function (assert) { + const scaleButtonContainer = ".scale-btn-container"; + + const readonlyAltText = ".alt-text"; + const editAltTextButton = ".alt-text-edit-btn"; + + const altTextInput = ".alt-text-input"; + const altTextEditOk = ".alt-text-edit-ok"; + const altTextEditCancel = ".alt-text-edit-cancel"; + + await visit("/"); + + await click("#create-topic"); + await fillIn(".d-editor-input", `![zorro|200x200](upload://zorro.png)`); + + assert.equal(query(readonlyAltText).innerText, "zorro", "correct alt text"); + assert.ok(visible(readonlyAltText), "alt text is visible"); + assert.ok(visible(editAltTextButton), "alt text edit button is visible"); + assert.ok(invisible(altTextInput), "alt text input is hidden"); + assert.ok(invisible(altTextEditOk), "alt text edit ok button is hidden"); + assert.ok(invisible(altTextEditCancel), "alt text edit cancel is hidden"); + + await click(editAltTextButton); + + assert.ok(invisible(scaleButtonContainer), "scale buttons are hidden"); + assert.ok(invisible(readonlyAltText), "alt text is hidden"); + assert.ok(invisible(editAltTextButton), "alt text edit button is hidden"); + assert.ok(visible(altTextInput), "alt text input is visible"); + assert.ok(visible(altTextEditOk), "alt text edit ok button is visible"); + assert.ok(visible(altTextEditCancel), "alt text edit cancel is hidden"); + assert.equal( + queryAll(altTextInput).val(), + "zorro", + "correct alt text in input" + ); + + await triggerKeyEvent(altTextInput, "keypress", "[".charCodeAt(0)); + await triggerKeyEvent(altTextInput, "keypress", "]".charCodeAt(0)); + assert.equal( + queryAll(altTextInput).val(), + "zorro", + "does not input [ ] keys" + ); + + await fillIn(altTextInput, "steak"); + await triggerKeyEvent(altTextInput, "keypress", 13); + + assert.equal( + queryAll(".d-editor-input").val(), + "![steak|200x200](upload://zorro.png)", + "alt text updated" + ); + assert.equal( + query(readonlyAltText).innerText, + "steak", + "shows the alt text" + ); + assert.ok(visible(editAltTextButton), "alt text edit button is visible"); + assert.ok(visible(scaleButtonContainer), "scale buttons are visible"); + assert.ok(visible(editAltTextButton), "alt text edit button is visible"); + assert.ok(invisible(altTextInput), "alt text input is hidden"); + assert.ok(invisible(altTextEditOk), "alt text edit ok button is hidden"); + assert.ok(invisible(altTextEditCancel), "alt text edit cancel is hidden"); + }); + + test("Editing alt text (with check button) in preview updates alt text in composer", async function (assert) { + const scaleButtonContainer = ".scale-btn-container"; + const readonlyAltText = ".alt-text"; + const editAltTextButton = ".alt-text-edit-btn"; + + const altTextInput = ".alt-text-input"; + const altTextEditOk = ".alt-text-edit-ok"; + const altTextEditCancel = ".alt-text-edit-cancel"; + + await visit("/"); + + await click("#create-topic"); + await fillIn(".d-editor-input", `![zorro|200x200](upload://zorro.png)`); + + await click(editAltTextButton); + + await fillIn(altTextInput, "steak"); + await click(altTextEditOk); + + assert.equal( + queryAll(".d-editor-input").val(), + "![steak|200x200](upload://zorro.png)", + "alt text updated" + ); + assert.equal( + query(readonlyAltText).innerText, + "steak", + "shows the alt text" + ); + + assert.ok(visible(editAltTextButton), "alt text edit button is visible"); + assert.ok(visible(scaleButtonContainer), "scale buttons are visible"); + assert.ok(visible(editAltTextButton), "alt text edit button is visible"); + assert.ok(invisible(altTextInput), "alt text input is hidden"); + assert.ok(invisible(altTextEditOk), "alt text edit ok button is hidden"); + assert.ok(invisible(altTextEditCancel), "alt text edit cancel is hidden"); + }); + + test("Cancel alt text edit in preview does not update alt text in composer", async function (assert) { + const scaleButtonContainer = ".scale-btn-container"; + + const readonlyAltText = ".alt-text"; + const editAltTextButton = ".alt-text-edit-btn"; + + const altTextInput = ".alt-text-input"; + const altTextEditOk = ".alt-text-edit-ok"; + const altTextEditCancel = ".alt-text-edit-cancel"; + + await visit("/"); + + await click("#create-topic"); + await fillIn(".d-editor-input", `![zorro|200x200](upload://zorro.png)`); + + await click(editAltTextButton); + + await fillIn(altTextInput, "steak"); + await click(altTextEditCancel); + + assert.equal( + queryAll(".d-editor-input").val(), + "![zorro|200x200](upload://zorro.png)", + "alt text not updated" + ); + assert.equal( + query(readonlyAltText).innerText, + "zorro", + "shows the unedited alt text" + ); + + assert.ok(visible(editAltTextButton), "alt text edit button is visible"); + assert.ok(visible(scaleButtonContainer), "scale buttons are visible"); + assert.ok(visible(editAltTextButton), "alt text edit button is visible"); + assert.ok(invisible(altTextInput), "alt text input is hidden"); + assert.ok(invisible(altTextEditOk), "alt text edit ok button is hidden"); + assert.ok(invisible(altTextEditCancel), "alt text edit cancel is hidden"); + }); + + test("Editing alt text for one of two images in preview updates correct alt text in composer", async function (assert) { + const editAltTextButton = ".alt-text-edit-btn"; + const altTextInput = ".alt-text-input"; + + await visit("/"); + await click("#create-topic"); + + await fillIn( + ".d-editor-input", + `![zorro|200x200](upload://zorro.png) ![not-zorro|200x200](upload://not-zorro.png)` + ); + await click(editAltTextButton); + + await fillIn(altTextInput, "tomtom"); + await triggerKeyEvent(altTextInput, "keypress", 13); + + assert.equal( + queryAll(".d-editor-input").val(), + `![tomtom|200x200](upload://zorro.png) ![not-zorro|200x200](upload://not-zorro.png)`, + "the correct image's alt text updated" + ); + }); + + test("Deleting alt text for image empties alt text in composer and allows further modification", async function (assert) { + const altText = ".alt-text"; + const editAltTextButton = ".alt-text-edit-btn"; + const altTextInput = ".alt-text-input"; + + await visit("/"); + + await click("#create-topic"); + await fillIn(".d-editor-input", `![zorro|200x200](upload://zorro.png)`); + + await click(editAltTextButton); + + await fillIn(altTextInput, ""); + await triggerKeyEvent(altTextInput, "keypress", 13); + + assert.equal( + queryAll(".d-editor-input").val(), + "![|200x200](upload://zorro.png)", + "alt text updated" + ); + assert.equal(query(altText).innerText, "", "shows the alt text"); + + await click(editAltTextButton); + + await fillIn(altTextInput, "tomtom"); + await triggerKeyEvent(altTextInput, "keypress", 13); + + assert.equal( + queryAll(".d-editor-input").val(), + "![tomtom|200x200](upload://zorro.png)", + "alt text updated" + ); + }); +}); diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js index 44d87a77d3..00d1eea075 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js @@ -1,3 +1,10 @@ +import { run } from "@ember/runloop"; +import { click, currentURL, fillIn, visit } from "@ember/test-helpers"; +import { toggleCheckDraftPopup } from "discourse/controllers/composer"; +import LinkLookup from "discourse/lib/link-lookup"; +import { withPluginApi } from "discourse/lib/plugin-api"; +import { CREATE_TOPIC, NEW_TOPIC_KEY } from "discourse/models/composer"; +import Draft from "discourse/models/draft"; import { acceptance, count, @@ -8,24 +15,11 @@ import { updateCurrentUser, visible, } from "discourse/tests/helpers/qunit-helpers"; -import { - click, - currentURL, - fillIn, - triggerKeyEvent, - visit, -} from "@ember/test-helpers"; -import { skip, test } from "qunit"; -import Draft from "discourse/models/draft"; -import I18n from "I18n"; -import { CREATE_TOPIC, NEW_TOPIC_KEY } from "discourse/models/composer"; -import { withPluginApi } from "discourse/lib/plugin-api"; -import { Promise } from "rsvp"; -import { run } from "@ember/runloop"; import selectKit from "discourse/tests/helpers/select-kit-helper"; +import I18n from "I18n"; +import { skip, test } from "qunit"; +import { Promise } from "rsvp"; import sinon from "sinon"; -import { toggleCheckDraftPopup } from "discourse/controllers/composer"; -import LinkLookup from "discourse/lib/link-lookup"; acceptance("Composer", function (needs) { needs.user(); @@ -808,14 +802,6 @@ acceptance("Composer", function (needs) { ); }); - const assertImageResized = (assert, uploads) => { - assert.strictEqual( - queryAll(".d-editor-input").val(), - uploads.join("\n"), - "it resizes uploaded image" - ); - }; - test("reply button has envelope icon when replying to private message", async function (assert) { await visit("/t/34"); await click("article#post_3 button.reply"); @@ -848,256 +834,6 @@ acceptance("Composer", function (needs) { ); }); - test("Image resizing buttons", async function (assert) { - await visit("/"); - await click("#create-topic"); - - let uploads = [ - // 0 Default markdown with dimensions- should work - "![test|690x313](upload://test.png)", - // 1 Image with scaling percentage, should work - "![test|690x313,50%](upload://test.png)", - // 2 image with scaling percentage and a proceeding whitespace, should work - "![test|690x313, 50%](upload://test.png)", - // 3 No dimensions, should not work - "![test](upload://test.jpeg)", - // 4 Wrapped in backticks should not work - "`![test|690x313](upload://test.png)`", - // 5 html image - should not work - "", - // 6 two images one the same line, but both are syntactically correct - both should work - "![onTheSameLine1|200x200](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250](upload://onTheSameLine2.jpeg)", - // 7 & 8 Identical images - both should work - "![identicalImage|300x300](upload://identicalImage.png)", - "![identicalImage|300x300](upload://identicalImage.png)", - // 9 Image with whitespaces in alt - should work - "![image with spaces in alt|690x220](upload://test.png)", - // 10 Image with markdown title - should work - `![image|690x220](upload://test.png "image title")`, - // 11 bbcode - should not work - "[img]/images/avatar.png[/img]", - // 12 Image with data attributes - "![test|foo=bar|690x313,50%|bar=baz](upload://test.png)", - ]; - - await fillIn(".d-editor-input", uploads.join("\n")); - - assert.strictEqual( - count(".button-wrapper"), - 10, - "it adds correct amount of scaling button groups" - ); - - // Default - uploads[0] = - "![test|690x313, 50%](upload://test.png)"; - await click( - queryAll( - ".button-wrapper[data-image-index='0'] .scale-btn[data-scale='50']" - )[0] - ); - assertImageResized(assert, uploads); - - // Targets the correct image if two on the same line - uploads[6] = - "![onTheSameLine1|200x200, 50%](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250](upload://onTheSameLine2.jpeg)"; - await click( - queryAll( - ".button-wrapper[data-image-index='3'] .scale-btn[data-scale='50']" - )[0] - ); - assertImageResized(assert, uploads); - - // Try the other image on the same line - uploads[6] = - "![onTheSameLine1|200x200, 50%](upload://onTheSameLine1.jpeg) ![onTheSameLine2|250x250, 75%](upload://onTheSameLine2.jpeg)"; - await click( - queryAll( - ".button-wrapper[data-image-index='4'] .scale-btn[data-scale='75']" - )[0] - ); - assertImageResized(assert, uploads); - - // Make sure we target the correct image if there are duplicates - uploads[7] = "![identicalImage|300x300, 50%](upload://identicalImage.png)"; - await click( - queryAll( - ".button-wrapper[data-image-index='5'] .scale-btn[data-scale='50']" - )[0] - ); - assertImageResized(assert, uploads); - - // Try the other dupe - uploads[8] = "![identicalImage|300x300, 75%](upload://identicalImage.png)"; - await click( - queryAll( - ".button-wrapper[data-image-index='6'] .scale-btn[data-scale='75']" - )[0] - ); - assertImageResized(assert, uploads); - - // Don't mess with image titles - uploads[10] = `![image|690x220, 75%](upload://test.png "image title")`; - await click( - queryAll( - ".button-wrapper[data-image-index='8'] .scale-btn[data-scale='75']" - )[0] - ); - assertImageResized(assert, uploads); - - // Keep data attributes - uploads[12] = `![test|foo=bar|690x313, 75%|bar=baz](upload://test.png)`; - await click( - queryAll( - ".button-wrapper[data-image-index='9'] .scale-btn[data-scale='75']" - )[0] - ); - assertImageResized(assert, uploads); - - await fillIn( - ".d-editor-input", - ` -![test|690x313](upload://test.png) - -\`\` - ` - ); - - assert.ok( - !exists("script"), - "it does not unescape script tags in code blocks" - ); - }); - - test("Editing alt text for single image in preview edits alt text in composer", async function (assert) { - const altText = ".image-wrapper .button-wrapper .alt-text"; - const editAltTextButton = - ".image-wrapper .button-wrapper .alt-text-edit-btn"; - const altTextInput = ".image-wrapper .button-wrapper .alt-text-input"; - - await visit("/"); - - await click("#create-topic"); - await fillIn(".d-editor-input", `![zorro|200x200](upload://zorro.png)`); - - // placement of elements - - assert.ok( - exists(altText), - "shows alt text in the image wrapper's button wrapper" - ); - - assert.ok( - exists(editAltTextButton + " .d-icon-pencil"), - "alt text edit button with icon is in the image wrapper's button wrapper" - ); - - assert.ok( - exists(altTextInput), - "alt text input is in the image wrapper's button wrapper" - ); - - // logical - - assert.equal(query(altText).innerText, "zorro", "correct alt text"); - assert.ok(visible(altText), "alt text is visible"); - assert.ok(visible(editAltTextButton), "alt text edit button is visible"); - assert.ok(invisible(altTextInput), "alt text input is not visible"); - - await click(editAltTextButton); - - assert.ok(invisible(altText), "readonly alt text is not visible"); - assert.ok( - invisible(editAltTextButton), - "alt text edit button is not visible" - ); - assert.ok(visible(altTextInput), "alt text input is visible"); - assert.equal( - queryAll(altTextInput).val(), - "zorro", - "correct alt text in input" - ); - - await triggerKeyEvent(altTextInput, "keypress", "[".charCodeAt(0)); - await triggerKeyEvent(altTextInput, "keypress", "]".charCodeAt(0)); - assert.equal( - queryAll(altTextInput).val(), - "zorro", - "does not input [ ] keys" - ); - - await fillIn(altTextInput, "steak"); - await triggerKeyEvent(altTextInput, "keypress", 13); - - assert.equal( - queryAll(".d-editor-input").val(), - "![steak|200x200](upload://zorro.png)", - "alt text updated" - ); - assert.equal(query(altText).innerText, "steak", "shows the alt text"); - assert.ok(visible(editAltTextButton), "alt text edit button is visible"); - assert.ok(invisible(altTextInput), "alt text input is not visible"); - }); - - test("Editing alt text for one of two images in preview updates correct alt text in composer", async function (assert) { - const editAltTextButton = - ".image-wrapper .button-wrapper .alt-text-edit-btn"; - const altTextInput = ".image-wrapper .button-wrapper .alt-text-input"; - - await visit("/"); - await click("#create-topic"); - - await fillIn( - ".d-editor-input", - `![zorro|200x200](upload://zorro.png) ![not-zorro|200x200](upload://not-zorro.png)` - ); - await click(editAltTextButton); - - await fillIn(altTextInput, "tomtom"); - await triggerKeyEvent(altTextInput, "keypress", 13); - - assert.equal( - queryAll(".d-editor-input").val(), - `![tomtom|200x200](upload://zorro.png) ![not-zorro|200x200](upload://not-zorro.png)`, - "the correct image's alt text updated" - ); - }); - - test("Deleting alt text for image empties alt text in composer and allows further modification", async function (assert) { - const altText = ".image-wrapper .button-wrapper .alt-text"; - const editAltTextButton = - ".image-wrapper .button-wrapper .alt-text-edit-btn"; - const altTextInput = ".image-wrapper .button-wrapper .alt-text-input"; - - await visit("/"); - - await click("#create-topic"); - await fillIn(".d-editor-input", `![zorro|200x200](upload://zorro.png)`); - - await click(editAltTextButton); - - await fillIn(altTextInput, ""); - await triggerKeyEvent(altTextInput, "keypress", 13); - - assert.equal( - queryAll(".d-editor-input").val(), - "![|200x200](upload://zorro.png)", - "alt text updated" - ); - assert.equal(query(altText).innerText, "", "shows the alt text"); - - await click(editAltTextButton); - - await fillIn(altTextInput, "tomtom"); - await triggerKeyEvent(altTextInput, "keypress", 13); - - assert.equal( - queryAll(".d-editor-input").val(), - "![tomtom|200x200](upload://zorro.png)", - "alt text updated" - ); - }); - skip("Shows duplicate_link notice", async function (assert) { await visit("/t/internationalization-localization/280"); await click("#topic-footer-buttons .create"); diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js index 6c49d5df00..56f51b8d20 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js +++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-controls.js @@ -67,16 +67,31 @@ function buildScaleButton(selectedScale, scale) { ); } -function buildImageAltTextButton(altText) { +function buildImageShowAltTextControls(altText) { return ` - - ${altText} - - - -`; + + ${altText} + + + + + `; +} + +function buildImageEditAltTextControls(altText) { + return ` + + `; } // We need this to load after `upload-protocol` which is priority 0 @@ -104,7 +119,12 @@ function ruleWithImageControls(oldRule) { ).join(""); result += ``; - result += buildImageAltTextButton(token.attrs[token.attrIndex("alt")][1]); + result += buildImageShowAltTextControls( + token.attrs[token.attrIndex("alt")][1] + ); + result += buildImageEditAltTextControls( + token.attrs[token.attrIndex("alt")][1] + ); result += ""; @@ -128,14 +148,25 @@ export function setup(helper) { "span.scale-btn[data-scale]", "span.button-wrapper[data-image-index]", "span[aria-label]", + + "span.alt-text-container", + "span.alt-text-readonly-container", "span.alt-text-readonly-container.alt-text", "span.alt-text-readonly-container.alt-text-edit-btn", "svg[class=fa d-icon d-icon-pencil svg-icon svg-string]", "use[href=#pencil-alt]", + + "span.alt-text-edit-container", + "span[hidden=true]", "input[type=text]", - "input[hidden=true]", "input[class=alt-text-input]", + "button[class=alt-text-edit-ok btn-primary]", + "svg[class=fa d-icon d-icon-check svg-icon svg-string]", + "use[href=#check]", + "button[class=alt-text-edit-cancel btn-default]", + "svg[class=fa d-icon d-icon-times svg-icon svg-string]", + "use[href=#times]", ]); helper.registerPlugin((md) => { diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss index 48446ae7ae..5461137594 100644 --- a/app/assets/stylesheets/common/d-editor.scss +++ b/app/assets/stylesheets/common/d-editor.scss @@ -179,6 +179,9 @@ } .button-wrapper { + min-width: 10em; + width: 100%; + display: flex; flex-wrap: wrap; gap: 0 0.5em; @@ -190,15 +193,19 @@ opacity: 0; transition: all 0.25s; z-index: 1; // needs to be higher than image - width: 100%; background: var(--secondary); // for when images are wider than controls .scale-btn-container, - .alt-text-readonly-container { + .alt-text-readonly-container, + .alt-text-edit-container { background: var(--secondary); display: flex; height: var(--resizer-height); align-items: center; + + &[hidden] { + display: none; + } } .scale-btn { @@ -222,8 +229,8 @@ } .alt-text-readonly-container { - max-width: 100%; flex: 1 1; + width: 100%; .alt-text { margin-right: 0.5em; @@ -233,25 +240,48 @@ max-width: 100%; } - .alt-text-edit-btn svg { - padding-right: 0.5em; - pointer-events: none; + .alt-text-edit-btn { + cursor: pointer; + + svg { + padding-right: 0.5em; + } + } + } + + .alt-text-edit-container { + margin-top: 0.25em; + gap: 0 0.25em; + flex: 1; + + .alt-text-input, + .alt-text-edit-ok, + .alt-text-edit-cancel { + height: var(--resizer-height); } .alt-text-input { - height: var(--resizer-height); - width: 100%; + flex: 1; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - max-width: 100%; margin: 0; + } - &[hidden="true"] { - display: none; + .alt-text-edit-ok, + .alt-text-edit-cancel { + border: none; + width: var(--resizer-height); + + svg { + margin: 0; } } } + + svg { + pointer-events: none; + } } } From 4b4973ee0dde12f1d65865336aae53231b7b6d3c Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Fri, 19 Nov 2021 12:30:39 +0800 Subject: [PATCH 027/168] PERF: Reduce records queried in `UserStat.update_first_unread_pm`. (#15016) The inefficiency here is that we were previously fetching all the records from `TopicAllowedUser` before filtering against a limited subset of users based on `User#last_seen_at`. --- app/models/user_stat.rb | 61 +++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb index 33e01183fd..e39ca94aea 100644 --- a/app/models/user_stat.rb +++ b/app/models/user_stat.rb @@ -24,40 +24,35 @@ class UserStat < ActiveRecord::Base SET first_unread_pm_at = COALESCE(Z.min_date, :now) FROM ( SELECT - Y.user_id, - Y.min_date - FROM ( + u1.id user_id, + X.min_date + FROM users u1 + LEFT JOIN ( SELECT - u1.id user_id, - X.min_date - FROM users u1 - LEFT JOIN ( - SELECT - tau.user_id, - MIN(t.updated_at) min_date - FROM topic_allowed_users tau - INNER JOIN topics t ON t.id = tau.topic_id - INNER JOIN users u ON u.id = tau.user_id - LEFT JOIN topic_users tu ON t.id = tu.topic_id AND tu.user_id = tau.user_id - WHERE t.deleted_at IS NULL - AND t.archetype = :archetype - AND tu.last_read_post_number < CASE - WHEN u.admin OR u.moderator - THEN t.highest_staff_post_number - ELSE t.highest_post_number - END - AND (COALESCE(tu.notification_level, 1) >= 2) - GROUP BY tau.user_id - ) AS X ON X.user_id = u1.id - ) AS Y - WHERE Y.user_id IN ( - SELECT id - FROM users - WHERE last_seen_at IS NOT NULL - AND last_seen_at > :last_seen - ORDER BY last_seen_at DESC - LIMIT :limit - ) + tau.user_id, + MIN(t.updated_at) min_date + FROM topic_allowed_users tau + INNER JOIN topics t ON t.id = tau.topic_id + INNER JOIN users u ON u.id = tau.user_id + LEFT JOIN topic_users tu ON t.id = tu.topic_id AND tu.user_id = tau.user_id + WHERE t.deleted_at IS NULL + AND t.archetype = :archetype + AND tu.last_read_post_number < CASE + WHEN u.admin OR u.moderator + THEN t.highest_staff_post_number + ELSE t.highest_post_number + END + AND (COALESCE(tu.notification_level, 1) >= 2) + AND tau.user_id IN ( + SELECT id + FROM users + WHERE last_seen_at IS NOT NULL + AND last_seen_at > :last_seen + ORDER BY last_seen_at DESC + LIMIT :limit + ) + GROUP BY tau.user_id + ) AS X ON X.user_id = u1.id ) AS Z WHERE us.user_id = Z.user_id SQL From 1566cd204823c7d745a587e9fb399353f1395cdc Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Fri, 19 Nov 2021 15:40:35 +0800 Subject: [PATCH 028/168] DEV: Return promise for toggleFilteredRepliesView widget action. (#15020) This allows plugin to wait on the promise when the widget action is called. --- app/assets/javascripts/discourse/app/widgets/post.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js index 0e6a904509..a5f7f4b3b9 100644 --- a/app/assets/javascripts/discourse/app/widgets/post.js +++ b/app/assets/javascripts/discourse/app/widgets/post.js @@ -483,9 +483,11 @@ createWidget("post-contents", { ) { controller.send("cancelFilter", currentFilterPostNumber); this.state.filteredRepliesShown = false; + return Promise.resolve(); } else { this.state.filteredRepliesShown = true; - post + + return post .get("topic.postStream") .filterReplies(post.post_number, post.id) .then(() => { From 2153011cdb2a4e8cbafcdf900bcedddb40d65a5b Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 19 Nov 2021 10:17:23 +0000 Subject: [PATCH 029/168] PERF: Use more efficient text-direction check in select-kit init (#15015) Calling `window.getComputedStyle` during initialization causes the browser to pause and 'Recalculate Style'. On my machine, this adds about 7ms to boot time. Instead, we can check for the `rtl` class on the html element, which is added by the server, and doesn't require computing styles. --- .../javascripts/select-kit/addon/components/select-kit.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js index 2bc430fd29..e115ee9b2b 100644 --- a/app/assets/javascripts/select-kit/addon/components/select-kit.js +++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js @@ -27,9 +27,7 @@ const SELECT_KIT_OPTIONS = Mixin.create({ }); function isDocumentRTL() { - return ( - window.getComputedStyle(document.querySelector("html")).direction === "rtl" - ); + return document.documentElement.classList.contains("rtl"); } export default Component.extend( From b0d8d9e73d49e0e195baf6daa84810b814454ff2 Mon Sep 17 00:00:00 2001 From: Andrei Prigorshnev Date: Fri, 19 Nov 2021 16:23:46 +0400 Subject: [PATCH 030/168] FIX: infinite recursion when calling a refresh() action on routes (#14624) --- .../app/controllers/user-topics-list.js | 5 +++ .../discourse/app/routes/group-messages.js | 8 ++--- .../app/routes/user-activity-read.js | 2 +- .../app/routes/user-activity-topics.js | 2 +- .../app/routes/user-private-messages.js | 19 +++++----- .../app/templates/user-topics-list.hbs | 2 +- .../acceptance/user-activity-read-test.js | 35 +++++++++++++++++-- .../acceptance/user-activity-topic-test.js | 35 +++++++++++++++++-- 8 files changed, 88 insertions(+), 20 deletions(-) diff --git a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js index f42350f8c3..021502f615 100644 --- a/app/assets/javascripts/discourse/app/controllers/user-topics-list.js +++ b/app/assets/javascripts/discourse/app/controllers/user-topics-list.js @@ -86,4 +86,9 @@ export default Controller.extend(BulkTopicSelection, { this.pmTopicTrackingState.resetIncomingTracking(); return false; }, + + @action + refresh() { + this.send("triggerRefresh"); + }, }); diff --git a/app/assets/javascripts/discourse/app/routes/group-messages.js b/app/assets/javascripts/discourse/app/routes/group-messages.js index fe255814bb..bbf8cb990a 100644 --- a/app/assets/javascripts/discourse/app/routes/group-messages.js +++ b/app/assets/javascripts/discourse/app/routes/group-messages.js @@ -1,5 +1,6 @@ import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; +import { action } from "@ember/object"; export default DiscourseRoute.extend({ titleToken() { @@ -19,9 +20,8 @@ export default DiscourseRoute.extend({ } }, - actions: { - refresh() { - this.refresh(); - }, + @action + triggerRefresh() { + this.refresh(); }, }); diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-read.js b/app/assets/javascripts/discourse/app/routes/user-activity-read.js index cceb733f7d..a663745c70 100644 --- a/app/assets/javascripts/discourse/app/routes/user-activity-read.js +++ b/app/assets/javascripts/discourse/app/routes/user-activity-read.js @@ -34,7 +34,7 @@ export default UserTopicListRoute.extend({ }, @action - refresh() { + triggerRefresh() { this.refresh(); }, }); diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-topics.js b/app/assets/javascripts/discourse/app/routes/user-activity-topics.js index c1bccb4509..9e48ca30d5 100644 --- a/app/assets/javascripts/discourse/app/routes/user-activity-topics.js +++ b/app/assets/javascripts/discourse/app/routes/user-activity-topics.js @@ -30,7 +30,7 @@ export default UserTopicListRoute.extend({ }, @action - refresh() { + triggerRefresh() { this.refresh(); }, }); diff --git a/app/assets/javascripts/discourse/app/routes/user-private-messages.js b/app/assets/javascripts/discourse/app/routes/user-private-messages.js index 1e00226bb7..8bca93af05 100644 --- a/app/assets/javascripts/discourse/app/routes/user-private-messages.js +++ b/app/assets/javascripts/discourse/app/routes/user-private-messages.js @@ -1,6 +1,7 @@ import Composer from "discourse/models/composer"; import DiscourseRoute from "discourse/routes/discourse"; import Draft from "discourse/models/draft"; +import { action } from "@ember/object"; export default DiscourseRoute.extend({ renderTemplate() { @@ -34,15 +35,15 @@ export default DiscourseRoute.extend({ } }, - actions: { - refresh() { - this.refresh(); - }, + @action + triggerRefresh() { + this.refresh(); + }, - willTransition() { - this._super(...arguments); - this.controllerFor("user").set("pmView", null); - return true; - }, + @action + willTransition() { + this._super(...arguments); + this.controllerFor("user").set("pmView", null); + return true; }, }); diff --git a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs index fb90f865f9..1c7d94036b 100644 --- a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs +++ b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs @@ -27,7 +27,7 @@ hideCategory=hideCategory showPosters=showPosters bulkSelectEnabled=bulkSelectEnabled - bulkSelectAction=(route-action "refresh") + bulkSelectAction=(action "refresh") selected=selected tagsForUser=tagsForUser onScroll=saveScrollPosition diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-activity-read-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-activity-read-test.js index 7c85564268..a5bd8d42c8 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/user-activity-read-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/user-activity-read-test.js @@ -1,6 +1,37 @@ -import { acceptance, exists } from "../helpers/qunit-helpers"; +import { acceptance, exists, queryAll } from "../helpers/qunit-helpers"; import { test } from "qunit"; -import { visit } from "@ember/test-helpers"; +import { click, visit } from "@ember/test-helpers"; +import userFixtures from "../fixtures/user-fixtures"; + +acceptance("User Activity / Read - bulk actions", function (needs) { + needs.user(); + + needs.pretender((server, helper) => { + server.get("/read.json", () => { + return helper.response(userFixtures["/topics/created-by/eviltrout.json"]); + }); + + server.put("topics/bulk", () => { + return helper.response({ topic_ids: [7764, 9318] }); + }); + }); + + test("bulk topic closing works", async function (assert) { + await visit("/u/charlie/activity/read"); + + await click("button.bulk-select"); + await click(queryAll("input.bulk-select")[0]); + await click(queryAll("input.bulk-select")[1]); + await click("button.bulk-select-actions"); + + await click("div.bulk-buttons button:nth-child(2)"); // the Close Topics button + + assert.notOk( + exists("div.bulk-buttons"), + "The bulk actions modal was closed" + ); + }); +}); acceptance("User Activity / Read - empty state", function (needs) { needs.user(); diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-activity-topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-activity-topic-test.js index da16e75148..623d68f7de 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/user-activity-topic-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/user-activity-topic-test.js @@ -1,6 +1,37 @@ -import { acceptance, exists } from "../helpers/qunit-helpers"; +import { acceptance, exists, queryAll } from "../helpers/qunit-helpers"; import { test } from "qunit"; -import { visit } from "@ember/test-helpers"; +import { click, visit } from "@ember/test-helpers"; +import userFixtures from "../fixtures/user-fixtures"; + +acceptance("User Activity / Topics - bulk actions", function (needs) { + needs.user(); + + needs.pretender((server, helper) => { + server.get("/topics/created-by/:username.json", () => { + return helper.response(userFixtures["/topics/created-by/eviltrout.json"]); + }); + + server.put("topics/bulk", () => { + return helper.response({ topic_ids: [7764, 9318] }); + }); + }); + + test("bulk topic closing works", async function (assert) { + await visit("/u/charlie/activity/topics"); + + await click("button.bulk-select"); + await click(queryAll("input.bulk-select")[0]); + await click(queryAll("input.bulk-select")[1]); + await click("button.bulk-select-actions"); + + await click("div.bulk-buttons button:nth-child(2)"); // the Close Topics button + + assert.notOk( + exists("div.bulk-buttons"), + "The bulk actions modal was closed" + ); + }); +}); acceptance("User Activity / Topics - empty state", function (needs) { needs.user(); From e906596942155290e7b264b8f8ea6c09a5aff1c8 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 19 Nov 2021 13:47:53 +0000 Subject: [PATCH 031/168] FIX: Ensure mobile topic-list links are treated as Ember transitions (#15022) In the topic lists, it's important that we apply `pointer-events: none;` to the links. 0e371d4 updated the selector used for this css. In `templates/list/topic-list-item.hbs`, `.main-link` is applied to the same element as `.topic-list-data`, so the new selector applied correctly. In `templates/mobile/list/topic-list-item.hbr`, `.main-link` is nested within `.topic-list-data`, so the new selector did not apply correctly. This commit switches the selector back to simply `.main-link`, so that it works for both mobile and desktop. --- app/assets/stylesheets/common/base/_topic-list.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index 7480ccf030..e82d928251 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -228,7 +228,7 @@ font-size: $font-0; } - .topic-list-data.main-link { + .main-link { @extend .topic-list-main-link; .raw-topic-link > * { From 97b27a742690d2afe20244c3db426c7cb9835c4a Mon Sep 17 00:00:00 2001 From: jbrw Date: Fri, 19 Nov 2021 11:00:11 -0500 Subject: [PATCH 032/168] FIX: Remove 'Open Draft' label after topic draft deleted (#14997) * FIX: Remove 'Open Draft' label after topic draft deleted --- .../discourse/app/components/d-navigation.js | 10 ++++++---- .../discourse/app/components/user-stream.js | 4 ++++ .../tests/acceptance/user-drafts-stream-test.js | 9 ++++++++- .../discourse/tests/fixtures/user-fixtures.js | 1 + 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.js b/app/assets/javascripts/discourse/app/components/d-navigation.js index 6d00181e9e..cc20ce09d1 100644 --- a/app/assets/javascripts/discourse/app/components/d-navigation.js +++ b/app/assets/javascripts/discourse/app/components/d-navigation.js @@ -59,11 +59,13 @@ export default Component.extend(FilterModeMixin, { @discourseComputed("categoryReadOnlyBanner", "hasDraft") createTopicClass(categoryReadOnlyBanner, hasDraft) { - if (categoryReadOnlyBanner && !hasDraft) { - return "btn-default disabled"; - } else { - return "btn-default"; + let classNames = ["btn-default"]; + if (hasDraft) { + classNames.push("open-draft"); + } else if (categoryReadOnlyBanner) { + classNames.push("disabled"); } + return classNames.join(" "); }, @discourseComputed("hasDraft") diff --git a/app/assets/javascripts/discourse/app/components/user-stream.js b/app/assets/javascripts/discourse/app/components/user-stream.js index 19473885b4..71cc51166e 100644 --- a/app/assets/javascripts/discourse/app/components/user-stream.js +++ b/app/assets/javascripts/discourse/app/components/user-stream.js @@ -5,6 +5,7 @@ import Draft from "discourse/models/draft"; import I18n from "I18n"; import LoadMore from "discourse/mixins/load-more"; import Post from "discourse/models/post"; +import { NEW_TOPIC_KEY } from "discourse/models/composer"; import bootbox from "bootbox"; import { getOwner } from "discourse-common/lib/get-owner"; import { observes } from "discourse-common/utils/decorators"; @@ -121,6 +122,9 @@ export default Component.extend(LoadMore, { Draft.clear(draft.draft_key, draft.sequence) .then(() => { stream.remove(draft); + if (draft.draft_key === NEW_TOPIC_KEY) { + this.currentUser.set("has_topic_draft", false); + } }) .catch((error) => { popupAjaxError(error); diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js index 5445eceec9..1b0fa65e58 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js @@ -16,7 +16,7 @@ acceptance("User Drafts", function (needs) { await visit("/u/eviltrout/activity/drafts"); assert.strictEqual(count(".user-stream-item"), 3, "has drafts"); - await click(".user-stream-item:last-child .remove-draft"); + await click(".user-stream-item:first-child .remove-draft"); assert.ok(visible(".bootbox")); await click(".bootbox .btn-primary"); @@ -25,6 +25,13 @@ acceptance("User Drafts", function (needs) { 2, "draft removed, list length diminished by one" ); + + await visit("/"); + assert.ok(visible("#create-topic")); + assert.ok( + !exists("#create-topic.open-draft"), + "Open Draft button is not present" + ); }); test("Stream - resume draft", async function (assert) { diff --git a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js index 43cde04348..102d369ac8 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js @@ -295,6 +295,7 @@ export default { day_6_end_time: 1020, }, timezone: "Australia/Brisbane", + has_topic_draft: true }, }, "/u/eviltrout/card.json": { From a9d592190193968023d6201f6d72b33f6558ab7a Mon Sep 17 00:00:00 2001 From: Mark VanLandingham Date: Fri, 19 Nov 2021 15:10:47 -0600 Subject: [PATCH 033/168] FIX: Allow poll feature to be disabled in discourse-markdown (#15025) --- .../poll/assets/javascripts/lib/discourse-markdown/poll.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js index 543a8e67d9..6238e32d57 100644 --- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js +++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js @@ -262,7 +262,9 @@ const rule = { function newApiInit(helper) { helper.registerOptions((opts, siteSettings) => { - opts.features.poll = !!siteSettings.poll_enabled; + if (!siteSettings.poll_enabled) { + opts.features.poll = false; + } opts.pollMaximumOptions = siteSettings.poll_maximum_options; }); From 10a57825c81160dfa2450be81a784bec1c3f7612 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Fri, 19 Nov 2021 16:15:10 -0500 Subject: [PATCH 034/168] UX: Fix fast edit save button color in dark schemes (#15027) --- app/assets/stylesheets/common/base/topic-post.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 7c78b7387d..efb68f7c94 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -432,6 +432,13 @@ aside.quote { color: var(--secondary-or-primary); } + .btn-primary, + .btn-primary:hover, + .btn-primary .d-icon, + .btn-primary:hover .d-icon { + color: var(--secondary); + } + .insert-quote + .quote-sharing { border-left: 1px solid rgba(255, 255, 255, 0.3); } From fa6b87a1bf054b56449da656ddb1483f7c42a100 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Mon, 22 Nov 2021 10:43:03 +1000 Subject: [PATCH 035/168] SECURITY: Strip unrendered unicode bidirectional chars in code blocks (#15032) When rendering the markdown code blocks we replace the offending characters in the output string with spans highlighting a textual representation of the character, along with a title attribute with information about why the character was highlighted. The list of characters stripped by this fix, which are the bidirectional characters considered relevant, are: U+202A U+202B U+202C U+202D U+202E U+2066 U+2067 U+2068 U+2069 --- .../stylesheets/common/base/topic-post.scss | 8 ++ config/locales/server.en.yml | 1 + lib/pretty_text.rb | 32 +++++++ spec/components/pretty_text_spec.rb | 89 +++++++++++++++++++ 4 files changed, 130 insertions(+) diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index efb68f7c94..60e6621e50 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -827,6 +827,14 @@ pre { background: var(--blend-primary-secondary-5); max-height: 500px; } + + .bidi-warning, + .bidi-warning span { + font-style: normal; + background-color: var(--highlight); + color: var(--danger); + cursor: help; + } } .copy-codeblocks { diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 9cd23f9b6d..cfc7881fde 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -717,6 +717,7 @@ en: post: image_placeholder: broken: "This image is broken" + hidden_bidi_character: "Bidirectional characters can change the order that text is rendered. This could be used to obscure malicious code." has_likes: one: "%{count} Like" other: "%{count} Likes" diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index a298ce4f80..fd0b26e8ba 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -5,6 +5,19 @@ require 'nokogiri' require 'erb' module PrettyText + DANGEROUS_BIDI_CHARACTERS = [ + "\u202A", + "\u202B", + "\u202C", + "\u202D", + "\u202E", + "\u2066", + "\u2067", + "\u2068", + "\u2069", + ].freeze + DANGEROUS_BIDI_REGEXP = Regexp.new(DANGEROUS_BIDI_CHARACTERS.join("|")).freeze + @mutex = Mutex.new @ctx_init = Mutex.new @@ -278,6 +291,7 @@ module PrettyText add_nofollow = !options[:omit_nofollow] && SiteSetting.add_rel_nofollow_to_user_content add_rel_attributes_to_user_content(doc, add_nofollow) + strip_hidden_unicode_bidirectional_characters(doc) if SiteSetting.enable_mentions add_mentions(doc, user_id: opts[:user_id]) @@ -290,6 +304,24 @@ module PrettyText loofah_fragment.scrub!(scrubber).to_html end + def self.strip_hidden_unicode_bidirectional_characters(doc) + return if !DANGEROUS_BIDI_REGEXP.match?(doc.content) + + doc.css("code,pre").each do |code_tag| + next if !DANGEROUS_BIDI_REGEXP.match?(code_tag.content) + + DANGEROUS_BIDI_CHARACTERS.each do |bidi| + next if !code_tag.content.include?(bidi) + + formatted = "<U+#{bidi.ord.to_s(16).upcase}>" + code_tag.inner_html = code_tag.inner_html.gsub( + bidi, + "#{formatted}" + ) + end + end + end + def self.add_rel_attributes_to_user_content(doc, add_nofollow) allowlist = [] diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index d4b7267291..1007fb97b5 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -552,6 +552,95 @@ describe PrettyText do Discourse.redis.flushdb end end + + it "strips out unicode bidirectional (bidi) override characters and replaces with a highlighted span" do + code = <<~MD + X + ```js + var isAdmin = false; + /*‮ begin admin only */⁦ if (isAdmin) ⁩ ⁦ { + console.log("You are an admin."); + /* end admins only ‮*/⁦ } + ``` + MD + cooked = PrettyText.cook(code) + hidden_bidi_title = I18n.t("post.hidden_bidi_character") + + html = <<~HTML +

X

+ 
var isAdmin = false;
+        /*<U+202E> begin admin only */<U+2066> if (isAdmin) <U+2069> <U+2066> {
+        console.log("You are an admin.");
+        /* end admins only <U+202E>*/<U+2066> }
+
+ HTML + + expect(cooked).to eq(html.strip) + end + + it "fuzzes all possible dangerous unicode bidirectional (bidi) override characters, making sure they are replaced" do + bad_bidi = [ + "\u202A", + "\u202B", + "\u202C", + "\u202D", + "\u202E", + "\u2066", + "\u2067", + "\u2068", + "\u2069", + ] + bad_bidi.each do |bidi| + code = <<~MD + ``` + #{bidi} + ``` + MD + cooked = PrettyText.cook(code) + formatted_bidi = format("<U+%04X>", bidi.ord) + html = <<~HTML + 
#{formatted_bidi}
+
+ HTML + expect(cooked).to eq(html.strip) + end + end + + it "fuzzes all possible dangerous unicode bidirectional (bidi) override characters in solo code and pre nodes, making sure they are replaced" do + bad_bidi = [ + "\u202A", + "\u202B", + "\u202C", + "\u202D", + "\u202E", + "\u2066", + "\u2067", + "\u2068", + "\u2069", + ] + bad_bidi.each do |bidi| + code = <<~MD + #{bidi} + MD + cooked = PrettyText.cook(code) + formatted_bidi = format("<U+%04X>", bidi.ord) + html = <<~HTML +

#{formatted_bidi}

+ HTML + expect(cooked).to eq(html.strip) + end + bad_bidi.each do |bidi| + code = <<~MD + 
#{bidi}
+ MD + cooked = PrettyText.cook(code) + formatted_bidi = format("<U+%04X>", bidi.ord) + html = <<~HTML + 
#{formatted_bidi}
+ HTML + expect(cooked).to eq(html.strip) + end + end end describe "rel attributes" do From d46e450733c45b73d142ae58ea3f9a67e01217d7 Mon Sep 17 00:00:00 2001 From: Natalie Tay Date: Mon, 22 Nov 2021 09:11:24 +0800 Subject: [PATCH 036/168] Refine dismiss notification confirmation (#15017) --- .../dismiss-notification-confirmation.js | 11 ++++++++ .../dismiss-notification-confirmation.hbs | 15 ++++++++++ .../discourse/app/widgets/user-menu.js | 19 ++++--------- .../dismiss-notification-modal-test.js | 28 +++++++++---------- config/locales/client.en.yml | 6 ++-- 5 files changed, 48 insertions(+), 31 deletions(-) create mode 100644 app/assets/javascripts/discourse/app/controllers/dismiss-notification-confirmation.js create mode 100644 app/assets/javascripts/discourse/app/templates/modal/dismiss-notification-confirmation.hbs diff --git a/app/assets/javascripts/discourse/app/controllers/dismiss-notification-confirmation.js b/app/assets/javascripts/discourse/app/controllers/dismiss-notification-confirmation.js new file mode 100644 index 0000000000..ff13e85c86 --- /dev/null +++ b/app/assets/javascripts/discourse/app/controllers/dismiss-notification-confirmation.js @@ -0,0 +1,11 @@ +import Controller from "@ember/controller"; +import ModalFunctionality from "discourse/mixins/modal-functionality"; + +export default Controller.extend(ModalFunctionality, { + actions: { + dismiss() { + this.send("closeModal"); + this.dismissNotifications(); + }, + }, +}); diff --git a/app/assets/javascripts/discourse/app/templates/modal/dismiss-notification-confirmation.hbs b/app/assets/javascripts/discourse/app/templates/modal/dismiss-notification-confirmation.hbs new file mode 100644 index 0000000000..ea948b48bc --- /dev/null +++ b/app/assets/javascripts/discourse/app/templates/modal/dismiss-notification-confirmation.hbs @@ -0,0 +1,15 @@ +{{#d-modal-body headerClass="hidden" class="dismiss-notification-confirmation"}} + {{i18n "notifications.dismiss_confirmation.body" count=count}} +{{/d-modal-body}} + +
+ {{d-button + icon="check" + class="btn-primary" + action=(action "dismiss") + label="notifications.dismiss_confirmation.dismiss"}} + {{d-button + action=(route-action "closeModal") + label="notifications.dismiss_confirmation.cancel" + class="btn-default"}} +
diff --git a/app/assets/javascripts/discourse/app/widgets/user-menu.js b/app/assets/javascripts/discourse/app/widgets/user-menu.js index e324dc867c..47d3f4496d 100644 --- a/app/assets/javascripts/discourse/app/widgets/user-menu.js +++ b/app/assets/javascripts/discourse/app/widgets/user-menu.js @@ -1,8 +1,7 @@ import { later } from "@ember/runloop"; -import bootbox from "bootbox"; import { createWidget } from "discourse/widgets/widget"; -import I18n from "I18n"; import { h } from "virtual-dom"; +import showModal from "discourse/lib/show-modal"; const UserMenuAction = { QUICK_ACCESS: "quickAccess", @@ -256,18 +255,10 @@ export default createWidget("user-menu", { ); if (unreadHighPriorityNotifications > 0) { - return bootbox.confirm( - I18n.t("notifications.dismiss_confirmation.body", { - count: unreadHighPriorityNotifications, - }), - I18n.t("notifications.dismiss_confirmation.cancel"), - I18n.t("notifications.dismiss_confirmation.confirm"), - (result) => { - if (result) { - this.state.markRead(); - } - } - ); + return showModal("dismiss-notification-confirmation").setProperties({ + count: unreadHighPriorityNotifications, + dismissNotifications: () => this.state.markRead(), + }); } else { return this.state.markRead(); } diff --git a/app/assets/javascripts/discourse/tests/acceptance/dismiss-notification-modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/dismiss-notification-modal-test.js index d18dd6f482..656cba95ae 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/dismiss-notification-modal-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/dismiss-notification-modal-test.js @@ -5,6 +5,7 @@ import { query, updateCurrentUser, } from "discourse/tests/helpers/qunit-helpers"; +import I18n from "I18n"; import { test } from "qunit"; import pretender from "../helpers/create-pretender"; @@ -19,7 +20,7 @@ acceptance("Dismiss notification confirmation", function (needs) { await visit("/"); await click(".current-user"); await click(".notifications-dismiss"); - assert.notOk(exists(".bootbox.modal")); + assert.notOk(exists(".dismiss-notification-confirmation")); }); test("shows confirmation modal", async function (assert) { @@ -29,13 +30,12 @@ acceptance("Dismiss notification confirmation", function (needs) { await visit("/"); await click(".current-user"); await click(".notifications-dismiss"); - assert.ok(exists(".bootbox.modal")); + assert.ok(exists(".dismiss-notification-confirmation")); assert.strictEqual( - query(".bootbox.modal .modal-body").innerText, - "You have 2 important notifications, are you sure you would like to dismiss?" + query(".dismiss-notification-confirmation-modal .modal-body").innerText, + I18n.t("notifications.dismiss_confirmation.body", { count: 2 }) ); - await click(".bootbox.modal .btn-default"); }); test("marks unread when confirm and closes modal", async function (assert) { @@ -47,19 +47,19 @@ acceptance("Dismiss notification confirmation", function (needs) { await click(".notifications-dismiss"); assert.strictEqual( - query(".bootbox.modal .btn-primary span").innerText, - "Confirm" + query(".dismiss-notification-confirmation-modal .btn-primary").innerText, + I18n.t("notifications.dismiss_confirmation.dismiss") ); pretender.put("/notifications/mark-read", () => { return [200, { "Content-Type": "application/json" }, { success: true }]; }); - await click(".bootbox.modal .btn-primary"); + await click(".dismiss-notification-confirmation-modal .btn-primary"); - assert.notOk(exists(".bootbox.modal")); + assert.notOk(exists(".dismiss-notification-confirmation")); }); - test("marks unread when cancel and closes modal", async function (assert) { + test("does marks unread when cancel and closes modal", async function (assert) { updateCurrentUser({ unread_high_priority_notifications: 2, }); @@ -68,12 +68,12 @@ acceptance("Dismiss notification confirmation", function (needs) { await click(".notifications-dismiss"); assert.strictEqual( - query(".bootbox.modal .btn-default span").innerText, - "Cancel" + query(".dismiss-notification-confirmation-modal .btn-default").innerText, + I18n.t("notifications.dismiss_confirmation.cancel") ); - await click(".bootbox.modal .btn-default"); + await click(".dismiss-notification-confirmation-modal .btn-default"); - assert.notOk(exists(".bootbox.modal")); + assert.notOk(exists(".dismiss-notification-confirmation")); }); }); diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 3b275eab94..65dd71c2dc 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2287,9 +2287,9 @@ en: votes_released: "%{description} - completed" dismiss_confirmation: body: - one: "You have %{count} important notification, are you sure you would like to dismiss?" - other: "You have %{count} important notifications, are you sure you would like to dismiss?" - confirm: "Confirm" + one: "Are you sure? You have %{count} important notification." + other: "Are you sure? You have %{count} important notifications." + dismiss: "Dismiss" cancel: "Cancel" group_message_summary: From df6003aef50c2640f8fb73b9e9cf2c06f3afd9f7 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Mon, 22 Nov 2021 11:30:12 +1000 Subject: [PATCH 037/168] DEV: Lint SCSS with prettier in pre-commit (#15033) We are linting SCSS on the GitHub actions CI but not on pre-commit, which can lead to lint failures in CI. Better to warn developers about this locally like our other lints. --- lefthook.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lefthook.yml b/lefthook.yml index 534e33e87b..41978efbf7 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -8,6 +8,10 @@ pre-commit: glob: "*.js" include: "app/assets/javascripts|test/javascripts" run: yarn pprettier --list-different {staged_files} + prettier-scss: + glob: "*.scss" + include: "app/assets/stylesheets" + run: yarn pprettier --list-different {staged_files} eslint: glob: "*.js" include: "app/assets/javascripts|test/javascripts" @@ -51,6 +55,10 @@ lints: glob: "*.js" include: "app/assets/javascripts|test/javascripts" run: yarn pprettier --list-different {all_files} + prettier-scss: + glob: "*.scss" + include: "app/assets/stylesheets" + run: yarn pprettier --list-different {all_files} eslint-assets-js: run: yarn eslint app/assets/javascripts eslint-test-js: From 901518394271c559585632462df75018cd18743d Mon Sep 17 00:00:00 2001 From: Natalie Tay Date: Mon, 22 Nov 2021 10:23:42 +0800 Subject: [PATCH 038/168] Always show input when editing text by removing hover (#15034) --- .../javascripts/discourse/app/components/composer-editor.js | 2 ++ app/assets/stylesheets/common/d-editor.scss | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js index 548556785f..317bdd9d0b 100644 --- a/app/assets/javascripts/discourse/app/components/composer-editor.js +++ b/app/assets/javascripts/discourse/app/components/composer-editor.js @@ -688,6 +688,7 @@ export default Component.extend(ComposerUpload, { imageResize.removeAttribute("hidden"); readonlyContainer.removeAttribute("hidden"); + buttonWrapper.removeAttribute("editing"); editContainer.setAttribute("hidden", "true"); }, @@ -743,6 +744,7 @@ export default Component.extend(ComposerUpload, { ); const editContainerInput = editContainer.querySelector(".alt-text-input"); + buttonWrapper.setAttribute("editing", "true"); imageResize.setAttribute("hidden", "true"); readonlyContainer.setAttribute("hidden", "true"); editContainerInput.value = altText.textContent; diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss index 5461137594..f4b0e6e68d 100644 --- a/app/assets/stylesheets/common/d-editor.scss +++ b/app/assets/stylesheets/common/d-editor.scss @@ -195,6 +195,10 @@ z-index: 1; // needs to be higher than image background: var(--secondary); // for when images are wider than controls + &[editing] { + opacity: 1; + } + .scale-btn-container, .alt-text-readonly-container, .alt-text-edit-container { From 9f8ee8f1372eab643951a49440024ee0fdbdf792 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Mon, 22 Nov 2021 13:38:49 +1000 Subject: [PATCH 039/168] FIX: Don't publish notifications to MessageBus for inactive users (#15035) We are pushing /notification-alert/#{user_id} and /notification/#{user_id} messages to MessageBus from both PostAlerter and User#publish_notification_state. This can cause memory issues on large sites with many users. This commit stems the bleeding by only sending these alert messages if the user in question has been seen in the last 30 days, which eliminates a large chunk of users on some sites. --- app/models/user.rb | 10 ++++++++++ app/services/post_alerter.rb | 6 +++++- spec/models/user_spec.rb | 14 +++++++++++++- spec/services/post_alerter_spec.rb | 31 +++++++++++++++++++++++++++++- 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 72b03efbed..2b61a92fc4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -590,6 +590,8 @@ class User < ActiveRecord::Base end def publish_notifications_state + return if !self.allow_live_notifications? + # publish last notification json with the message so we can apply an update notification = notifications.visible.order('notifications.created_at desc').first json = NotificationSerializer.new(notification).as_json if notification @@ -693,6 +695,10 @@ class User < ActiveRecord::Base last_seen_at.present? end + def seen_since?(datetime) + seen_before? && last_seen_at >= datetime + end + def create_visit_record!(date, opts = {}) user_stat.update_column(:days_visited, user_stat.days_visited + 1) user_visits.create!(visited_at: date, posts_read: opts[:posts_read] || 0, mobile: opts[:mobile] || false) @@ -1438,6 +1444,10 @@ class User < ActiveRecord::Base ShelvedNotification.joins(:notification).where("notifications.user_id = ?", self.id) end + def allow_live_notifications? + seen_since?(30.days.ago) + end + protected def badge_grant diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb index c52922d9c0..1847fa42a4 100644 --- a/app/services/post_alerter.rb +++ b/app/services/post_alerter.rb @@ -28,7 +28,11 @@ class PostAlerter } DiscourseEvent.trigger(:pre_notification_alert, user, payload) - MessageBus.publish("/notification-alert/#{user.id}", payload, user_ids: [user.id]) + + if user.allow_live_notifications? + MessageBus.publish("/notification-alert/#{user.id}", payload, user_ids: [user.id]) + end + push_notification(user, payload) DiscourseEvent.trigger(:post_notification_alert, user, payload) end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 5ee0734b71..1a6a22588a 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' describe User do - let(:user) { Fabricate(:user) } + let(:user) { Fabricate(:user, last_seen_at: 1.day.ago) } def user_error_message(*keys) I18n.t(:"activerecord.errors.models.user.attributes.#{keys.join('.')}") @@ -1921,6 +1921,18 @@ describe User do expect(message.data[:unread_private_messages]).to eq(2) expect(message.data[:unread_high_priority_notifications]).to eq(2) end + + it "does not publish to the /notification channel for users who have not been seen in > 30 days" do + notification = Fabricate(:notification, user: user) + notification2 = Fabricate(:notification, user: user, read: true) + user.update(last_seen_at: 31.days.ago) + + message = MessageBus.track_publish("/notification/#{user.id}") do + user.publish_notifications_state + end.first + + expect(message).to eq(nil) + end end describe "silenced?" do diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb index b2335c8123..84a30aabbc 100644 --- a/spec/services/post_alerter_spec.rb +++ b/spec/services/post_alerter_spec.rb @@ -848,7 +848,7 @@ describe PostAlerter do end describe "create_notification_alert" do - it "does not nothing for suspended users" do + it "does nothing for suspended users" do evil_trout.update_columns(suspended_till: 1.year.from_now) post = Fabricate(:post) @@ -869,6 +869,35 @@ describe PostAlerter do expect(messages.size).to eq(0) expect(Jobs::PushNotification.jobs.size).to eq(0) end + + it "does not publish to MessageBus /notification-alert if the user has not been seen for > 30 days, but still sends a push notification" do + evil_trout.update_columns(last_seen_at: 31.days.ago) + post = Fabricate(:post) + + SiteSetting.allowed_user_api_push_urls = "https://site2.com/push" + UserApiKey.create!(user_id: evil_trout.id, + client_id: "xxx#1", + application_name: "iPhone1", + scopes: ['notifications'].map { |name| UserApiKeyScope.new(name: name) }, + push_url: "https://site2.com/push") + + events = nil + messages = MessageBus.track_publish do + events = DiscourseEvent.track_events do + PostAlerter.create_notification_alert( + user: evil_trout, + post: post, + notification_type: Notification.types[:custom], + excerpt: "excerpt", + username: "username" + ) + end + end + + expect(events.size).to eq(2) + expect(messages.size).to eq(0) + expect(Jobs::PushNotification.jobs.size).to eq(1) + end end describe "watching_first_post" do From 8a3ab1cc438468ab5a7e6dbe277bd5dd7ca6ba50 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Mon, 22 Nov 2021 14:59:10 +1000 Subject: [PATCH 040/168] DEV: Fix spec (#15036) Broken by 9f8ee8f1372eab643951a49440024ee0fdbdf792 --- spec/models/notification_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb index 9afd1d8651..2e91a5e728 100644 --- a/spec/models/notification_spec.rb +++ b/spec/models/notification_spec.rb @@ -183,7 +183,7 @@ describe Notification do end describe 'message bus' do - fab!(:user) { Fabricate(:user) } + fab!(:user) { Fabricate(:user, last_seen_at: 1.day.ago) } it 'updates the notification count on create' do Notification.any_instance.expects(:refresh_notification_count).returns(nil) From 5a8e6de42ca91dcbfd500497332bae0f3e1ce96d Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 22 Nov 2021 12:31:53 +0100 Subject: [PATCH 041/168] FIX: Don't publish polls on message bus when there are no polls (#15041) `poll` plugin was publishing on `/polls/[topic_id]` every time a non-first post was created. I can't imagine this being needed. It regressed 3 years ago in https://github.com/discourse/discourse/pull/6359 --- plugins/poll/plugin.rb | 9 ++++---- plugins/poll/spec/lib/poll_spec.rb | 37 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb index 078d40c0ec..677852cc05 100644 --- a/plugins/poll/plugin.rb +++ b/plugins/poll/plugin.rb @@ -160,10 +160,11 @@ after_initialize do guardian = Guardian.new(user) DiscoursePoll::Poll.schedule_jobs(post) - unless post.is_first_post? - polls = ActiveModel::ArraySerializer.new(post.polls, each_serializer: PollSerializer, root: false, scope: guardian).as_json - post.publish_message!("/polls/#{post.topic_id}", post_id: post.id, polls: polls) - end + next if post.is_first_post? + next if post.custom_fields[DiscoursePoll::HAS_POLLS].blank? + + polls = ActiveModel::ArraySerializer.new(post.polls, each_serializer: PollSerializer, root: false, scope: guardian).as_json + post.publish_message!("/polls/#{post.topic_id}", post_id: post.id, polls: polls) end on(:merging_users) do |source_user, target_user| diff --git a/plugins/poll/spec/lib/poll_spec.rb b/plugins/poll/spec/lib/poll_spec.rb index 92740546c0..139a82dd7c 100644 --- a/plugins/poll/spec/lib/poll_spec.rb +++ b/plugins/poll/spec/lib/poll_spec.rb @@ -128,4 +128,41 @@ describe DiscoursePoll::Poll do ) end end + + describe "post_created" do + it "publishes on message bus if a there are polls" do + first_post = Fabricate(:post) + topic = first_post.topic + creator = PostCreator.new(user, + topic_id: topic.id, + raw: <<~RAW + [poll] + * 1 + * 2 + [/poll] + RAW + ) + + messages = MessageBus.track_publish("/polls/#{topic.id}") do + creator.create! + end + + expect(messages.count).to eq(1) + end + + it "does not publish on message bus when a post with no polls is created" do + first_post = Fabricate(:post) + topic = first_post.topic + creator = PostCreator.new(user, + topic_id: topic.id, + raw: "Just a post with definitely no polls" + ) + + messages = MessageBus.track_publish("/polls/#{topic.id}") do + creator.create! + end + + expect(messages.count).to eq(0) + end + end end From f43c433d5069e43eb64efc74ea9ca48f26050729 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Mon, 22 Nov 2021 14:04:35 +0200 Subject: [PATCH 042/168] FIX: Allow invites if must_approve_users is true (#15043) This was implemented in 36e0e6a, but then regressed when the guardian for invites was refactored in 76a7b75. --- lib/guardian.rb | 1 - spec/components/guardian_spec.rb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/guardian.rb b/lib/guardian.rb index a0ba295b5d..de83fd31d4 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -362,7 +362,6 @@ class Guardian def can_invite_to_forum?(groups = nil) authenticated? && - (is_staff? || !SiteSetting.must_approve_users?) && (is_staff? || SiteSetting.max_invites_per_day.to_i.positive?) && (is_staff? || @user.has_trust_level?(SiteSetting.min_trust_level_to_allow_invite.to_i)) && (is_admin? || groups.blank? || groups.all? { |g| can_edit_group?(g) }) diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index 86e45b0bfd..d7e567a2b5 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -492,9 +492,9 @@ describe Guardian do expect(Guardian.new.can_invite_to_forum?).to be_falsey end - it 'returns true when the site requires approving users and is mod' do + it 'returns true when the site requires approving users' do SiteSetting.must_approve_users = true - expect(Guardian.new(moderator).can_invite_to_forum?).to be_truthy + expect(Guardian.new(trust_level_2).can_invite_to_forum?).to be_truthy end it 'returns false when max_invites_per_day is 0' do From d91d67a442a1223e44772bd339c2ffc9d901b3b4 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 22 Nov 2021 13:16:56 +0100 Subject: [PATCH 043/168] FEATURE: Allow theme settings to request refresh (#15037) Similar to site settings, adds support for `refresh` option to theme settings. ```yaml super_feature_enabled: type: bool default: false refresh: true ``` --- app/models/theme.rb | 13 ++++++ lib/theme_settings_manager.rb | 4 ++ lib/theme_settings_parser.rb | 2 + .../theme_settings/valid_settings.yaml | 4 ++ spec/models/theme_spec.rb | 40 +++++++++++++++++++ 5 files changed, 63 insertions(+) diff --git a/app/models/theme.rb b/app/models/theme.rb index 3f59348d9e..c7b3def305 100644 --- a/app/models/theme.rb +++ b/app/models/theme.rb @@ -94,6 +94,13 @@ class Theme < ActiveRecord::Base clear_cached_settings! DB.after_commit { ColorScheme.hex_cache.clear } notify_theme_change(with_scheme: notify_with_scheme) + + if theme_setting_requests_refresh + DB.after_commit do + Discourse.request_refresh! + self.theme_setting_requests_refresh = false + end + end end def update_child_components @@ -572,6 +579,10 @@ class Theme < ActiveRecord::Base raise Discourse::NotFound unless target_setting target_setting.value = new_value + + if target_setting.requests_refresh? + self.theme_setting_requests_refresh = true + end end def update_translation(translation_key, new_value) @@ -727,6 +738,8 @@ class Theme < ActiveRecord::Base private + attr_accessor :theme_setting_requests_refresh + def to_scss_variable(name, value) escaped = SassC::Script::Value::String.quote(value, sass: true) "$#{name}: unquote(#{escaped});" diff --git a/lib/theme_settings_manager.rb b/lib/theme_settings_manager.rb index 2e905717b7..c520da5650 100644 --- a/lib/theme_settings_manager.rb +++ b/lib/theme_settings_manager.rb @@ -37,6 +37,10 @@ class ThemeSettingsManager @opts[:description] # Old method of specifying description. Is now overridden by locale file end + def requests_refresh? + @opts[:refresh] + end + def value=(new_value) ensure_is_valid_value!(new_value) diff --git a/lib/theme_settings_parser.rb b/lib/theme_settings_parser.rb index e12f5d0339..b7b14b81c2 100644 --- a/lib/theme_settings_parser.rb +++ b/lib/theme_settings_parser.rb @@ -43,6 +43,8 @@ class ThemeSettingsParser opts[:textarea] = !!raw_opts[:textarea] opts[:json_schema] = raw_opts[:json_schema] + opts[:refresh] = !!raw_opts[:refresh] + opts end diff --git a/spec/fixtures/theme_settings/valid_settings.yaml b/spec/fixtures/theme_settings/valid_settings.yaml index 95be277cf3..a6e8e9b6fa 100644 --- a/spec/fixtures/theme_settings/valid_settings.yaml +++ b/spec/fixtures/theme_settings/valid_settings.yaml @@ -80,3 +80,7 @@ invalid_json_schema_setting: valid_json_schema_setting: default: "" json_schema: '{ "type": "array", "uniqueItems": true, "items": { "type": "object", "properties": { "color": { "type": "string" }, "icon": { "type": "string" } }, "additionalProperties": false } }' + +causes_refresh: + default: "" + refresh: true diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb index a47571e444..d5bddee782 100644 --- a/spec/models/theme_spec.rb +++ b/spec/models/theme_spec.rb @@ -902,4 +902,44 @@ HTML expect(new_digest).to eq(digest) end end + + describe "#update_setting" do + it "requests clients to refresh if `refresh: true`" do + theme.set_field(target: :settings, name: "yaml", value: <<~YAML) + super_feature_enabled: + type: bool + default: false + refresh: true + YAML + + ThemeSetting.create!(theme: theme, data_type: ThemeSetting.types[:bool], name: "super_feature_enabled") + theme.save! + + messages = MessageBus.track_publish do + theme.update_setting(:super_feature_enabled, true) + theme.save! + end.filter { |m| m.channel == "/global/asset-version" } + + expect(messages.count).to eq(1) + end + + it "does not request clients to refresh if `refresh: false`" do + theme.set_field(target: :settings, name: "yaml", value: <<~YAML) + super_feature_enabled: + type: bool + default: false + refresh: false + YAML + + ThemeSetting.create!(theme: theme, data_type: ThemeSetting.types[:bool], name: "super_feature_enabled") + theme.save! + + messages = MessageBus.track_publish do + theme.update_setting(:super_feature_enabled, true) + theme.save! + end.filter { |m| m.channel == "/global/asset-version" } + + expect(messages.count).to eq(0) + end + end end From 648332bc9f19fe4b85063e3c97e26375b0f7f7ec Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 22 Nov 2021 16:43:12 +0100 Subject: [PATCH 044/168] DEV: Don't clear cache/trigger events if site setting hasn't changed (#15045) --- lib/site_setting_extension.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb index c86c67ff24..b011375a53 100644 --- a/lib/site_setting_extension.rb +++ b/lib/site_setting_extension.rb @@ -355,6 +355,9 @@ module SiteSettingExtension old_val = current[name] provider.destroy(name) current[name] = defaults.get(name, default_locale) + + return if current[name] == old_val + clear_uploads_cache(name) clear_cache! DiscourseEvent.trigger(:site_setting_changed, name, old_val, current[name]) if old_val != current[name] @@ -369,6 +372,9 @@ module SiteSettingExtension sanitized_val = sanitize_override ? sanitize_field(val) : val provider.save(name, sanitized_val, type) current[name] = type_supervisor.to_rb_value(name, sanitized_val) + + return if current[name] == old_val + clear_uploads_cache(name) notify_clients!(name) if client_settings.include? name clear_cache! From da9cd4f6928a36af77e98d0e44103d256d12bad5 Mon Sep 17 00:00:00 2001 From: Blake Erickson Date: Mon, 22 Nov 2021 10:16:35 -0700 Subject: [PATCH 045/168] DEV: Swap out optipng with oxipng (#15013) * DEV: Swap out optipng with oxipng The oxipng binary has been added to our base docker image here: https://github.com/discourse/discourse_docker/commit/244c9cb110df44eb9d846a24b5572471a2687071 oxipng is a rust replacement for optipng that provides increased performance and multi-threading. Checkout https://github.com/shssoichiro/oxipng for more info. * add instructions for installing oxipng --- docs/DEVELOPER-ADVANCED.md | 6 ++++++ docs/DEVELOPMENT-OSX-NATIVE.md | 2 +- lib/file_helper.rb | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md index 6ad004b1aa..a4dac6c68b 100644 --- a/docs/DEVELOPER-ADVANCED.md +++ b/docs/DEVELOPER-ADVANCED.md @@ -14,6 +14,12 @@ To get your Ubuntu 16.04 or 18.04 LTS install up and running to develop Discours sudo apt-get -yqq update sudo apt-get -yqq install software-properties-common vim curl expect debconf-utils git-core build-essential zlib1g-dev libssl-dev openssl libcurl4-openssl-dev libreadline6-dev libpcre3 libpcre3-dev imagemagick redis-server advancecomp jhead jpegoptim libjpeg-turbo-progs optipng pngcrush pngquant gnupg2 + # oxipng + mkdir /tmp/oxipng-install && cd /tmp/oxipng-install + wget https://github.com/shssoichiro/oxipng/releases/download/v5.0.1/oxipng-5.0.1-x86_64-unknown-linux-musl.tar.gz + tar -xzf oxipng-5.0.1-x86_64-unknown-linux-musl.tar.gz && cd oxipng-5.0.1-x86_64-unknown-linux-musl + cp oxipng /usr/local/bin + # Ruby curl -sSL https://rvm.io/mpapis.asc | gpg2 --import - curl -sSL https://rvm.io/pkuczynski.asc | gpg2 --import - diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md index c8a0d51b9e..2ef9f10695 100644 --- a/docs/DEVELOPMENT-OSX-NATIVE.md +++ b/docs/DEVELOPMENT-OSX-NATIVE.md @@ -225,7 +225,7 @@ In addition to ImageMagick we also need to install some other image related software: ```sh -brew install jpegoptim optipng jhead +brew install jpegoptim optipng oxipng jhead npm install -g svgo ``` diff --git a/lib/file_helper.rb b/lib/file_helper.rb index acdf958f36..9c90e58adb 100644 --- a/lib/file_helper.rb +++ b/lib/file_helper.rb @@ -116,7 +116,8 @@ class FileHelper timeout: 15, skip_missing_workers: true, # PNG - optipng: { level: 2, strip: strip_image_metadata }, + oxipng: { level: 3, strip: strip_image_metadata }, + optipng: false, advpng: false, pngcrush: false, pngout: false, @@ -128,7 +129,6 @@ class FileHelper # Skip looking for gifsicle, svgo binaries gifsicle: false, svgo: false, - oxipng: false ) end end From c891c44775787cf9ca112a39575b2a4605105cfe Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Mon, 22 Nov 2021 14:37:32 -0300 Subject: [PATCH 046/168] UX: Lower digest suppress period from a year to 6 months (#15023) --- config/site_settings.yml | 2 +- spec/jobs/enqueue_digest_emails_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/site_settings.yml b/config/site_settings.yml index a1bad6eab0..1edf130787 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1068,7 +1068,7 @@ email: min: 0 max: 20 suppress_digest_email_after_days: - default: 365 + default: 180 max: 36500 digest_suppress_categories: type: category_list diff --git a/spec/jobs/enqueue_digest_emails_spec.rb b/spec/jobs/enqueue_digest_emails_spec.rb index b207d8484e..2ce3b450b3 100644 --- a/spec/jobs/enqueue_digest_emails_spec.rb +++ b/spec/jobs/enqueue_digest_emails_spec.rb @@ -91,7 +91,7 @@ describe Jobs::EnqueueDigestEmails do end context 'regular users' do - let!(:user) { Fabricate(:active_user, last_seen_at: 360.days.ago) } + let!(:user) { Fabricate(:active_user, last_seen_at: (SiteSetting.suppress_digest_email_after_days - 1).days.ago) } it "returns the user" do expect(Jobs::EnqueueDigestEmails.new.target_user_ids).to eq([user.id]) From fd66df599743e9d11a4d3f8d198ec3533ba26767 Mon Sep 17 00:00:00 2001 From: RogerBW Date: Mon, 22 Nov 2021 17:49:08 +0000 Subject: [PATCH 047/168] FEATURE: adds uploads scope for API keys (#14941) * FEATURE: adds uploads scope for API keys * Add basic test, change "image" to "file" --- app/models/api_key_scope.rb | 3 +++ config/locales/client.en.yml | 2 ++ spec/requests/admin/api_controller_spec.rb | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/api_key_scope.rb b/app/models/api_key_scope.rb index 9016da3b68..08cf32a9dd 100644 --- a/app/models/api_key_scope.rb +++ b/app/models/api_key_scope.rb @@ -35,6 +35,9 @@ class ApiKeyScope < ActiveRecord::Base posts: { edit: { actions: %w[posts#update], params: %i[id] } }, + uploads: { + create: { actions: %w[uploads#create] } + }, users: { bookmarks: { actions: %w[users#bookmarks], params: %i[username] }, sync_sso: { actions: %w[admin/users#sync_sso], params: %i[sso sig] }, diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 65dd71c2dc..431c046b23 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -4193,6 +4193,8 @@ en: wordpress: Necessary for the WordPress wp-discourse plugin to work. posts: edit: Edit any post or a specific one. + uploads: + create: Upload a new file. users: bookmarks: List user bookmarks. It returns bookmark reminders when using the ICS format. sync_sso: Synchronize a user using DiscourseConnect. diff --git a/spec/requests/admin/api_controller_spec.rb b/spec/requests/admin/api_controller_spec.rb index e1f2d4d4e2..2be52a0a97 100644 --- a/spec/requests/admin/api_controller_spec.rb +++ b/spec/requests/admin/api_controller_spec.rb @@ -237,7 +237,7 @@ describe Admin::ApiController do scopes = response.parsed_body['scopes'] - expect(scopes.keys).to contain_exactly('topics', 'users', 'email', 'posts', 'global') + expect(scopes.keys).to contain_exactly('topics', 'users', 'email', 'posts', 'uploads', 'global') end end end From d420a7b2c8ff3b8bfa90c68c2a129e02cb40d446 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Mon, 22 Nov 2021 20:18:53 +0200 Subject: [PATCH 048/168] DEV: Reuse code for TrustLevelAndStaffSetting (#15044) The code that checked this permission was duplicated everytime a new settings of this type was added. This commit changes the behavior of some functionality because some feature checks were bypassed for staff members. --- app/models/user.rb | 6 ++++++ lib/guardian.rb | 7 ++++--- lib/guardian/tag_guardian.rb | 8 ++------ lib/guardian/topic_guardian.rb | 5 +---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 2b61a92fc4..3bc2adb737 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1021,6 +1021,12 @@ class User < ActiveRecord::Base admin? || moderator? || staged? || TrustLevel.compare(trust_level, level) end + def has_trust_level_or_staff?(level) + return admin? if level.to_s == 'admin' + return staff? if level.to_s == 'staff' + has_trust_level?(level.to_i) + end + # a touch faster than automatic def admin? admin diff --git a/lib/guardian.rb b/lib/guardian.rb index de83fd31d4..983fd0daa8 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -56,6 +56,9 @@ class Guardian def has_trust_level?(level) false end + def has_trust_level_or_staff?(level) + false + end def email nil end @@ -443,9 +446,7 @@ class Guardian # User is authenticated return false if !authenticated? # User is trusted enough - return is_admin? if SiteSetting.min_trust_to_send_email_messages.to_s == 'admin' - return is_staff? if SiteSetting.min_trust_to_send_email_messages.to_s == 'staff' - SiteSetting.enable_personal_messages && @user.has_trust_level?(SiteSetting.min_trust_to_send_email_messages.to_i) + SiteSetting.enable_personal_messages && @user.has_trust_level_or_staff?(SiteSetting.min_trust_to_send_email_messages) end def can_export_entity?(entity) diff --git a/lib/guardian/tag_guardian.rb b/lib/guardian/tag_guardian.rb index 59e370cc8f..5d95faf825 100644 --- a/lib/guardian/tag_guardian.rb +++ b/lib/guardian/tag_guardian.rb @@ -3,15 +3,11 @@ #mixin for all guardian methods dealing with tagging permissions module TagGuardian def can_create_tag? - return is_admin? if SiteSetting.min_trust_to_create_tag.to_s == 'admin' - return is_staff? if SiteSetting.min_trust_to_create_tag.to_s == 'staff' - user && SiteSetting.tagging_enabled && user.has_trust_level?(SiteSetting.min_trust_to_create_tag.to_i) + SiteSetting.tagging_enabled && @user.has_trust_level_or_staff?(SiteSetting.min_trust_to_create_tag) end def can_tag_topics? - return is_admin? if SiteSetting.min_trust_level_to_tag_topics.to_s == 'admin' - return is_staff? if SiteSetting.min_trust_level_to_tag_topics.to_s == 'staff' - user && SiteSetting.tagging_enabled && user.has_trust_level?(SiteSetting.min_trust_level_to_tag_topics.to_i) + SiteSetting.tagging_enabled && @user.has_trust_level_or_staff?(SiteSetting.min_trust_level_to_tag_topics) end def can_tag_pms? diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb index ef619bd112..6c6bc719d6 100644 --- a/lib/guardian/topic_guardian.rb +++ b/lib/guardian/topic_guardian.rb @@ -32,10 +32,7 @@ module TopicGuardian end def can_see_shared_draft? - return is_admin? if SiteSetting.shared_drafts_min_trust_level.to_s == 'admin' - return is_staff? if SiteSetting.shared_drafts_min_trust_level.to_s == 'staff' - - @user.has_trust_level?(SiteSetting.shared_drafts_min_trust_level.to_i) + @user.has_trust_level_or_staff?(SiteSetting.shared_drafts_min_trust_level) end def can_create_whisper? From ceed48f3211c1bc79e007cd23916d2c7b53f6342 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 22 Nov 2021 19:43:45 +0100 Subject: [PATCH 049/168] UX: Make banner full-width (#15038) --- app/assets/stylesheets/common/components/banner.scss | 1 + app/assets/stylesheets/desktop/_index.scss | 1 - app/assets/stylesheets/desktop/banner.scss | 8 -------- app/assets/stylesheets/mobile/_index.scss | 1 - app/assets/stylesheets/mobile/components/_index.scss | 1 + .../stylesheets/mobile/{ => components}/banner.scss | 0 6 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 app/assets/stylesheets/desktop/banner.scss rename app/assets/stylesheets/mobile/{ => components}/banner.scss (100%) diff --git a/app/assets/stylesheets/common/components/banner.scss b/app/assets/stylesheets/common/components/banner.scss index 22ec02c63d..fc47c4ee45 100644 --- a/app/assets/stylesheets/common/components/banner.scss +++ b/app/assets/stylesheets/common/components/banner.scss @@ -8,6 +8,7 @@ color: var(--primary); z-index: z("base") + 1; margin-bottom: 1em; + max-height: 250px; overflow: auto; &.overlay { diff --git a/app/assets/stylesheets/desktop/_index.scss b/app/assets/stylesheets/desktop/_index.scss index 4e34333d83..499f8f4a21 100644 --- a/app/assets/stylesheets/desktop/_index.scss +++ b/app/assets/stylesheets/desktop/_index.scss @@ -1,5 +1,4 @@ @import "admin_customize"; -@import "banner"; @import "category-list"; @import "compose"; @import "discourse"; diff --git a/app/assets/stylesheets/desktop/banner.scss b/app/assets/stylesheets/desktop/banner.scss deleted file mode 100644 index 933d266a2b..0000000000 --- a/app/assets/stylesheets/desktop/banner.scss +++ /dev/null @@ -1,8 +0,0 @@ -// -------------------------------------------------- -// Banner -// -------------------------------------------------- - -#banner { - max-width: 1090px; - max-height: 250px; -} diff --git a/app/assets/stylesheets/mobile/_index.scss b/app/assets/stylesheets/mobile/_index.scss index 02c43e3528..b1cca1189d 100644 --- a/app/assets/stylesheets/mobile/_index.scss +++ b/app/assets/stylesheets/mobile/_index.scss @@ -5,7 +5,6 @@ @import "admin_report"; @import "admin_reports"; @import "alert"; -@import "banner"; @import "buttons"; @import "compose"; @import "dashboard"; diff --git a/app/assets/stylesheets/mobile/components/_index.scss b/app/assets/stylesheets/mobile/components/_index.scss index 89eb683655..5f1e914256 100644 --- a/app/assets/stylesheets/mobile/components/_index.scss +++ b/app/assets/stylesheets/mobile/components/_index.scss @@ -1,3 +1,4 @@ +@import "banner"; @import "topic-footer-mobile-dropdown"; @import "user-card"; @import "user-stream-item"; diff --git a/app/assets/stylesheets/mobile/banner.scss b/app/assets/stylesheets/mobile/components/banner.scss similarity index 100% rename from app/assets/stylesheets/mobile/banner.scss rename to app/assets/stylesheets/mobile/components/banner.scss From bd2e1a8c3853b1233bf36306125bfb587dbafd56 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 22 Nov 2021 19:44:00 +0100 Subject: [PATCH 050/168] FIX: Don't hit permalink-check if not authorized (#15039) --- app/assets/javascripts/discourse/app/routes/unknown.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/javascripts/discourse/app/routes/unknown.js b/app/assets/javascripts/discourse/app/routes/unknown.js index 5f74049896..8fddb0991d 100644 --- a/app/assets/javascripts/discourse/app/routes/unknown.js +++ b/app/assets/javascripts/discourse/app/routes/unknown.js @@ -6,6 +6,10 @@ export default DiscourseRoute.extend({ model(_, transition) { const path = transition.intent.url; + if (!this.currentUser && this.siteSettings.login_required) { + return; + } + return ajax("/permalink-check.json", { data: { path }, }).then((results) => { From 68b0fdd2b3efa4d547237c4b51d5b37be3da2923 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 22 Nov 2021 19:44:20 +0100 Subject: [PATCH 051/168] DEV: Fix silence user context message (#15040) --- app/services/user_silencer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/user_silencer.rb b/app/services/user_silencer.rb index fc74af58da..10c3b1c74a 100644 --- a/app/services/user_silencer.rb +++ b/app/services/user_silencer.rb @@ -35,7 +35,7 @@ class UserSilencer @opts[:message_body] ).format - context = "#{message_type}: '#{post.topic&.title rescue ''}' #{@opts[:reason]}" + context = "#{message_type}: #{@opts[:reason]}" if @by_user log_params = { context: context, details: details } From 4da23e811badb21d80f62951faaa044ffcb9b016 Mon Sep 17 00:00:00 2001 From: Mark VanLandingham Date: Mon, 22 Nov 2021 13:32:12 -0600 Subject: [PATCH 052/168] DEV: Create CookedProcessMixin to process generic cooked (#15029) --- lib/cooked_post_processor.rb | 289 ++-------------------------- lib/cooked_processor_mixin.rb | 343 ++++++++++++++++++++++++++++++++++ 2 files changed, 355 insertions(+), 277 deletions(-) create mode 100644 lib/cooked_processor_mixin.rb diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index 1dae3a22de..0bcc2d3224 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -4,6 +4,8 @@ # For example, inserting the onebox content, or image sizes/thumbnails. class CookedPostProcessor + include CookedProcessorMixin + LIGHTBOX_WRAPPER_CSS_CLASS = "lightbox-wrapper" LOADING_SIZE = 10 LOADING_COLORS = 32 @@ -15,12 +17,15 @@ class CookedPostProcessor @dirty = false @opts = opts @post = post + @model = post @previous_cooked = (@post.cooked || "").dup # NOTE: we re-cook the post here in order to prevent timing issues with edits # cf. https://meta.discourse.org/t/edit-of-rebaked-post-doesnt-show-in-html-only-in-raw/33815/6 @cooking_options = post.cooking_options || opts[:cooking_options] || {} @cooking_options[:topic_id] = post.topic_id @cooking_options = @cooking_options.symbolize_keys + @with_secure_media = @post.with_secure_media? + @category_id = @post&.topic&.category_id cooked = post.cook(post.raw, @cooking_options) @doc = Loofah.fragment(cooked) @@ -186,18 +191,6 @@ class CookedPostProcessor true end - def large_images - @large_images ||= @post.custom_fields[Post::LARGE_IMAGES].presence || [] - end - - def broken_images - @broken_images ||= @post.custom_fields[Post::BROKEN_IMAGES].presence || [] - end - - def downloaded_images - @downloaded_images ||= @post.downloaded_images - end - def extract_images # all images with a src attribute @doc.css("img[src]") - @@ -223,88 +216,16 @@ class CookedPostProcessor @doc.css(".onebox.githubfolder img") end - def oneboxed_images - @doc.css(".onebox-body img, .onebox img, img.onebox") + def large_images + @large_images ||= @post&.custom_fields[Post::LARGE_IMAGES].presence || [] end - def limit_size!(img) - # retrieve the size from - # 1) the width/height attributes - # 2) the dimension from the preview (image_sizes) - # 3) the dimension of the original image (HTTP request) - w, h = get_size_from_attributes(img) || - get_size_from_image_sizes(img["src"], @opts[:image_sizes]) || - get_size(img["src"]) - - # limit the size of the thumbnail - img["width"], img["height"] = ImageSizer.resize(w, h) + def broken_images + @broken_images ||= @post&.custom_fields[Post::BROKEN_IMAGES].presence || [] end - def get_size_from_attributes(img) - w, h = img["width"].to_i, img["height"].to_i - return [w, h] unless w <= 0 || h <= 0 - # if only width or height are specified attempt to scale image - if w > 0 || h > 0 - w = w.to_f - h = h.to_f - - return unless original_image_size = get_size(img["src"]) - original_width, original_height = original_image_size.map(&:to_f) - - if w > 0 - ratio = w / original_width - [w.floor, (original_height * ratio).floor] - else - ratio = h / original_height - [(original_width * ratio).floor, h.floor] - end - end - end - - def get_size_from_image_sizes(src, image_sizes) - return unless image_sizes.present? - image_sizes.each do |image_size| - url, size = image_size[0], image_size[1] - if url && url.include?(src) && - size && size["width"].to_i > 0 && size["height"].to_i > 0 - return [size["width"], size["height"]] - end - end - nil - end - - def add_to_size_cache(url, w, h) - @size_cache[url] = [w, h] - end - - def get_size(url) - return @size_cache[url] if @size_cache.has_key?(url) - - absolute_url = url - absolute_url = Discourse.base_url_no_prefix + absolute_url if absolute_url =~ /^\/[^\/]/ - - return unless absolute_url - - # FastImage fails when there's no scheme - absolute_url = SiteSetting.scheme + ":" + absolute_url if absolute_url.start_with?("//") - - # we can't direct FastImage to our secure-media-uploads url because it bounces - # anonymous requests with a 404 error - if url && Upload.secure_media_url?(url) - absolute_url = Upload.signed_url_from_secure_media_url(absolute_url) - end - - return unless is_valid_image_url?(absolute_url) - - @size_cache[url] = FastImage.size(absolute_url) - rescue Zlib::BufError, URI::Error, OpenSSL::SSL::SSLError - # FastImage.size raises BufError for some gifs, leave it. - end - - def is_valid_image_url?(url) - uri = URI.parse(url) - %w(http https).include? uri.scheme - rescue URI::Error + def downloaded_images + @downloaded_images ||= @post&.downloaded_images || [] end def convert_to_link!(img) @@ -374,15 +295,6 @@ class CookedPostProcessor upload.thumbnail(LOADING_SIZE, LOADING_SIZE) end - def is_a_hyperlink?(img) - parent = img.parent - while parent - return true if parent.name == "a" - parent = parent.parent if parent.respond_to?(:parent) - end - false - end - def each_responsive_ratio SiteSetting .responsive_post_image_sizes @@ -464,35 +376,6 @@ class CookedPostProcessor I18n.t("upload.pasted_image_filename") end - def create_node(tag_name, klass) - node = Nokogiri::XML::Node.new(tag_name, @doc) - node["class"] = klass if klass.present? - node - end - - def create_span_node(klass, content = nil) - span = create_node("span", klass) - span.content = content if content - span - end - - def create_icon_node(klass) - icon = create_node("svg", "fa d-icon d-icon-#{klass} svg-icon") - icon.set_attribute("aria-hidden", "true") - icon << "" - - end - - def create_link_node(klass, url, external = false) - a = create_node("a", klass) - a["href"] = url - if external - a["target"] = "_blank" - a["rel"] = "nofollow noopener" - end - a - end - def update_post_image upload = nil images = extract_images_for_post @@ -523,125 +406,6 @@ class CookedPostProcessor end end - def post_process_oneboxes - limit = SiteSetting.max_oneboxes_per_post - oneboxes = {} - inlineOneboxes = {} - - Oneboxer.apply(@doc, extra_paths: [".inline-onebox-loading"]) do |url, element| - is_onebox = element["class"] == Oneboxer::ONEBOX_CSS_CLASS - map = is_onebox ? oneboxes : inlineOneboxes - skip_onebox = limit <= 0 && !map[url] - - if skip_onebox - if is_onebox - element.remove_class('onebox') - else - remove_inline_onebox_loading_class(element) - end - - next - end - - limit -= 1 - map[url] = true - - if is_onebox - onebox = Oneboxer.onebox(url, - invalidate_oneboxes: !!@opts[:invalidate_oneboxes], - user_id: @post&.user_id, - category_id: @post&.topic&.category_id - ) - - @has_oneboxes = true if onebox.present? - onebox - else - process_inline_onebox(element) - false - end - end - - oneboxed_images.each do |img| - next if img["src"].blank? - - src = img["src"].sub(/^https?:/i, "") - parent = img.parent - img_classes = (img["class"] || "").split(" ") - link_classes = ((parent&.name == "a" && parent["class"]) || "").split(" ") - - if img_classes.include?("onebox") || link_classes.include?("onebox") - next if add_image_placeholder!(img) - elsif large_images.include?(src) || broken_images.include?(src) - img.remove - next - end - - upload_id = downloaded_images[src] - upload = Upload.find_by_id(upload_id) if upload_id - - if upload.present? - img["src"] = UrlHelper.cook_url(upload.url, secure: @post.with_secure_media?) - end - - # make sure we grab dimensions for oneboxed images - # and wrap in a div - limit_size!(img) - - next if img["class"]&.include?('onebox-avatar') - - parent = parent&.parent if parent&.name == "a" - parent_class = parent && parent["class"] - width = img["width"].to_i - height = img["height"].to_i - - if parent_class&.include?("onebox-body") && width > 0 && height > 0 - # special instruction for width == height, assume we are dealing with an avatar - if (img["width"].to_i == img["height"].to_i) - found = false - parent = img - while parent = parent.parent - if parent["class"] && parent["class"].include?("allowlistedgeneric") - found = true - break - end - end - - if found - img["class"] = img["class"].to_s + " onebox-avatar" - next - end - end - - if width < 64 && height < 64 - img["class"] = img["class"].to_s + " onebox-full-image" - else - img.delete('width') - img.delete('height') - new_parent = img.add_next_sibling("
") - new_parent.first.add_child(img) - end - elsif (parent_class&.include?("instagram-images") || parent_class&.include?("tweet-images") || parent_class&.include?("scale-images")) && width > 0 && height > 0 - img.remove_attribute("width") - img.remove_attribute("height") - parent["class"] = "aspect-image-full-size" - parent["style"] = "--aspect-ratio:#{width}/#{height};" - end - end - - if @omit_nofollow || !SiteSetting.add_rel_nofollow_to_user_content - @doc.css(".onebox-body a[rel], .onebox a[rel]").each do |a| - rel_values = a['rel'].split(' ').map(&:downcase) - rel_values.delete('nofollow') - rel_values.delete('ugc') - if rel_values.blank? - a.remove_attribute("rel") - else - a["rel"] = rel_values.join(' ') - end - end - end - end - def optimize_urls %w{href data-download-href}.each do |selector| @doc.css("a[#{selector}]").each do |a| @@ -701,7 +465,7 @@ class CookedPostProcessor staff_action_logger = StaffActionLogger.new(Discourse.system_user) staff_action_logger.log_site_setting_change("download_remote_images_to_local", true, false, details: reason) - # also send a private message to the site contact user + # also send a private message to the site contact user notify_about_low_disk_space notify_about_low_disk_space end @@ -713,14 +477,6 @@ class CookedPostProcessor 100 - DiskSpace.percent_free("#{Rails.root}/public/uploads") end - def dirty? - @previous_cooked != html - end - - def html - @doc.try(:to_html) - end - private def post_process_images @@ -729,26 +485,6 @@ class CookedPostProcessor end end - def process_inline_onebox(element) - inline_onebox = InlineOneboxer.lookup( - element.attributes["href"].value, - invalidate: !!@opts[:invalidate_oneboxes], - user_id: @post&.user_id, - category_id: @post&.topic&.category_id - ) - - if title = inline_onebox&.dig(:title) - element.children = CGI.escapeHTML(title) - element.add_class("inline-onebox") - end - - remove_inline_onebox_loading_class(element) - end - - def remove_inline_onebox_loading_class(element) - element.remove_class("inline-onebox-loading") - end - def is_svg?(img) path = begin @@ -759,5 +495,4 @@ class CookedPostProcessor File.extname(path) == '.svg' if path end - end diff --git a/lib/cooked_processor_mixin.rb b/lib/cooked_processor_mixin.rb new file mode 100644 index 0000000000..b644d15840 --- /dev/null +++ b/lib/cooked_processor_mixin.rb @@ -0,0 +1,343 @@ +# frozen_string_literal: true + +module CookedProcessorMixin + + def post_process_oneboxes + limit = SiteSetting.max_oneboxes_per_post + oneboxes = {} + inlineOneboxes = {} + + Oneboxer.apply(@doc, extra_paths: [".inline-onebox-loading"]) do |url, element| + is_onebox = element["class"] == Oneboxer::ONEBOX_CSS_CLASS + map = is_onebox ? oneboxes : inlineOneboxes + skip_onebox = limit <= 0 && !map[url] + + if skip_onebox + if is_onebox + element.remove_class('onebox') + else + remove_inline_onebox_loading_class(element) + end + + next + end + + limit -= 1 + map[url] = true + + if is_onebox + onebox = Oneboxer.onebox(url, + invalidate_oneboxes: !!@opts[:invalidate_oneboxes], + user_id: @model&.user_id, + category_id: @category_id + ) + + @has_oneboxes = true if onebox.present? + onebox + else + process_inline_onebox(element) + false + end + end + + oneboxed_images.each do |img| + next if img["src"].blank? + + src = img["src"].sub(/^https?:/i, "") + parent = img.parent + img_classes = (img["class"] || "").split(" ") + link_classes = ((parent&.name == "a" && parent["class"]) || "").split(" ") + + if img_classes.include?("onebox") || link_classes.include?("onebox") + next if add_image_placeholder!(img) + elsif large_images.include?(src) || broken_images.include?(src) + img.remove + next + end + + upload_id = downloaded_images[src] + upload = Upload.find_by_id(upload_id) if upload_id + + if upload.present? + img["src"] = UrlHelper.cook_url(upload.url, secure: @with_secure_media) + end + + # make sure we grab dimensions for oneboxed images + # and wrap in a div + limit_size!(img) + + next if img["class"]&.include?('onebox-avatar') + + parent = parent&.parent if parent&.name == "a" + parent_class = parent && parent["class"] + width = img["width"].to_i + height = img["height"].to_i + + if parent_class&.include?("onebox-body") && width > 0 && height > 0 + # special instruction for width == height, assume we are dealing with an avatar + if (img["width"].to_i == img["height"].to_i) + found = false + parent = img + while parent = parent.parent + if parent["class"] && parent["class"].include?("allowlistedgeneric") + found = true + break + end + end + + if found + img["class"] = img["class"].to_s + " onebox-avatar" + next + end + end + + if width < 64 && height < 64 + img["class"] = img["class"].to_s + " onebox-full-image" + else + img.delete('width') + img.delete('height') + new_parent = img.add_next_sibling("
") + new_parent.first.add_child(img) + end + elsif (parent_class&.include?("instagram-images") || parent_class&.include?("tweet-images") || parent_class&.include?("scale-images")) && width > 0 && height > 0 + img.remove_attribute("width") + img.remove_attribute("height") + parent["class"] = "aspect-image-full-size" + parent["style"] = "--aspect-ratio:#{width}/#{height};" + end + end + + if @omit_nofollow || !SiteSetting.add_rel_nofollow_to_user_content + @doc.css(".onebox-body a[rel], .onebox a[rel]").each do |a| + rel_values = a['rel'].split(' ').map(&:downcase) + rel_values.delete('nofollow') + rel_values.delete('ugc') + if rel_values.blank? + a.remove_attribute("rel") + else + a["rel"] = rel_values.join(' ') + end + end + end + end + + def limit_size!(img) + # retrieve the size from + # 1) the width/height attributes + # 2) the dimension from the preview (image_sizes) + # 3) the dimension of the original image (HTTP request) + w, h = get_size_from_attributes(img) || + get_size_from_image_sizes(img["src"], @opts[:image_sizes]) || + get_size(img["src"]) + + # limit the size of the thumbnail + img["width"], img["height"] = ImageSizer.resize(w, h) + end + + def get_size_from_attributes(img) + w, h = img["width"].to_i, img["height"].to_i + return [w, h] unless w <= 0 || h <= 0 + # if only width or height are specified attempt to scale image + if w > 0 || h > 0 + w = w.to_f + h = h.to_f + + return unless original_image_size = get_size(img["src"]) + original_width, original_height = original_image_size.map(&:to_f) + + if w > 0 + ratio = w / original_width + [w.floor, (original_height * ratio).floor] + else + ratio = h / original_height + [(original_width * ratio).floor, h.floor] + end + end + end + + def get_size_from_image_sizes(src, image_sizes) + return unless image_sizes.present? + image_sizes.each do |image_size| + url, size = image_size[0], image_size[1] + if url && url.include?(src) && + size && size["width"].to_i > 0 && size["height"].to_i > 0 + return [size["width"], size["height"]] + end + end + nil + end + + def add_to_size_cache(url, w, h) + @size_cache[url] = [w, h] + end + + def get_size(url) + return @size_cache[url] if @size_cache.has_key?(url) + + absolute_url = url + absolute_url = Discourse.base_url_no_prefix + absolute_url if absolute_url =~ /^\/[^\/]/ + + return unless absolute_url + + # FastImage fails when there's no scheme + absolute_url = SiteSetting.scheme + ":" + absolute_url if absolute_url.start_with?("//") + + # we can't direct FastImage to our secure-media-uploads url because it bounces + # anonymous requests with a 404 error + if url && Upload.secure_media_url?(url) + absolute_url = Upload.signed_url_from_secure_media_url(absolute_url) + end + + return unless is_valid_image_url?(absolute_url) + + @size_cache[url] = FastImage.size(absolute_url) + rescue Zlib::BufError, URI::Error, OpenSSL::SSL::SSLError + # FastImage.size raises BufError for some gifs, leave it. + end + + def is_valid_image_url?(url) + uri = URI.parse(url) + %w(http https).include? uri.scheme + rescue URI::Error + end + + def add_image_placeholder!(img) + src = img["src"].sub(/^https?:/i, "") + + if large_images.include?(src) + return add_large_image_placeholder!(img) + elsif broken_images.include?(src) + return add_broken_image_placeholder!(img) + end + + false + end + + def add_large_image_placeholder!(img) + url = img["src"] + + is_hyperlinked = is_a_hyperlink?(img) + + placeholder = create_node("div", "large-image-placeholder") + img.add_next_sibling(placeholder) + placeholder.add_child(img) + + a = create_link_node(nil, url, true) + img.add_next_sibling(a) + + span = create_span_node("url", url) + a.add_child(span) + span.add_previous_sibling(create_icon_node("far-image")) + span.add_next_sibling( + create_span_node( + "help", + I18n.t( + "upload.placeholders.too_large_humanized", + max_size: ActiveSupport::NumberHelper.number_to_human_size(SiteSetting.max_image_size_kb.kilobytes) + ) + ) + ) + + # Only if the image is already linked + if is_hyperlinked + parent = placeholder.parent + parent.add_next_sibling(placeholder) + + if parent.name == 'a' && parent["href"].present? + if url == parent["href"] + parent.remove + else + parent["class"] = "link" + a.add_previous_sibling(parent) + + lspan = create_span_node("url", parent["href"]) + parent.add_child(lspan) + lspan.add_previous_sibling(create_icon_node("link")) + end + end + end + + img.remove + true + end + + def add_broken_image_placeholder!(img) + img.name = "span" + img.set_attribute("class", "broken-image") + img.set_attribute("title", I18n.t("post.image_placeholder.broken")) + img << "" + img.remove_attribute("src") + img.remove_attribute("width") + img.remove_attribute("height") + true + end + + def oneboxed_images + @doc.css(".onebox-body img, .onebox img, img.onebox") + end + + def is_a_hyperlink?(img) + parent = img.parent + while parent + return true if parent.name == "a" + parent = parent.parent if parent.respond_to?(:parent) + end + false + end + + def process_inline_onebox(element) + inline_onebox = InlineOneboxer.lookup( + element.attributes["href"].value, + invalidate: !!@opts[:invalidate_oneboxes], + user_id: @model&.user_id, + category_id: @category_id + ) + + if title = inline_onebox&.dig(:title) + element.children = CGI.escapeHTML(title) + element.add_class("inline-onebox") + end + + remove_inline_onebox_loading_class(element) + end + + def remove_inline_onebox_loading_class(element) + element.remove_class("inline-onebox-loading") + end + + def dirty? + @previous_cooked != html + end + + def html + @doc.try(:to_html) + end + + def create_link_node(klass, url, external = false) + a = create_node("a", klass) + a["href"] = url + if external + a["target"] = "_blank" + a["rel"] = "nofollow noopener" + end + a + end + + def create_icon_node(klass) + icon = create_node("svg", "fa d-icon d-icon-#{klass} svg-icon") + icon.set_attribute("aria-hidden", "true") + icon << "" + end + + def create_node(tag_name, klass) + node = Nokogiri::XML::Node.new(tag_name, @doc) + node["class"] = klass if klass.present? + node + end + + def create_span_node(klass, content = nil) + span = create_node("span", klass) + span.content = content if content + span + end +end From 377c8d9c8b2bbf8cce295b6d943d59941d8cb11c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 22:25:42 +0100 Subject: [PATCH 053/168] Build(deps): Bump sprockets-rails from 3.4.0 to 3.4.1 (#15052) Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/rails/sprockets-rails/releases) - [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.0...v3.4.1) --- updated-dependencies: - dependency-name: sprockets-rails dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f01cf9dcc0..4a48036e70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -198,6 +198,7 @@ GEM jwt (2.3.0) kgio (2.11.4) libv8-node (16.10.0.0) + libv8-node (16.10.0.0-arm64-darwin) libv8-node (16.10.0.0-x86_64-darwin) libv8-node (16.10.0.0-x86_64-darwin-19) libv8-node (16.10.0.0-x86_64-linux) @@ -440,7 +441,7 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.4.0) + sprockets-rails (3.4.1) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) From 49c49e8ae063150a16207d681cc8007c097d49c9 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Tue, 23 Nov 2021 08:45:42 +1000 Subject: [PATCH 054/168] FEATURE: Local chunked uppy backup uploads with a new uploader plugin (#14894) This takes the uppy chunking algorithm and combines it with some form submission from resumable.js for parity with the current backup controller to make local backup uploads work with uppy. We can then use this to replace the resumable-upload component and the resumable.js library from our codebase, once stable. This is disabled by default, so people using local backups will not be affected. The enable_experimental_backup_uploader site setting must be enabled for this to work. --- .../addon/controllers/admin-backups-index.js | 3 - .../admin/addon/templates/backups-index.hbs | 20 +- app/assets/javascripts/discourse-shims.js | 16 + .../app/components/uppy-backup-uploader.js | 22 +- .../discourse/app/lib/uppy-chunked-upload.js | 339 ++++++++++++++++++ .../app/lib/uppy-chunked-uploader-plugin.js | 211 +++++++++++ .../discourse/app/lib/uppy-plugin-base.js | 78 ++-- .../discourse/app/mixins/uppy-upload.js | 30 +- app/assets/javascripts/discourse/package.json | 1 + app/controllers/admin/backups_controller.rb | 4 +- package.json | 1 + vendor/assets/javascripts/custom-uppy.js | 5 + vendor/assets/javascripts/uppy.js | 7 +- 13 files changed, 688 insertions(+), 49 deletions(-) create mode 100644 app/assets/javascripts/discourse/app/lib/uppy-chunked-upload.js create mode 100644 app/assets/javascripts/discourse/app/lib/uppy-chunked-uploader-plugin.js diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js index 7b53b2170d..c53adeecf9 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js @@ -12,9 +12,6 @@ export default Controller.extend({ uploadLabel: i18n("admin.backups.upload.label"), backupLocation: setting("backup_location"), localBackupStorage: equal("backupLocation", "local"), - enableExperimentalBackupUploader: setting( - "enable_experimental_backup_uploader" - ), @discourseComputed("status.allowRestore", "status.isOperationRunning") restoreTitle(allowRestore, isOperationRunning) { diff --git a/app/assets/javascripts/admin/addon/templates/backups-index.hbs b/app/assets/javascripts/admin/addon/templates/backups-index.hbs index 1a3ae7181b..da2e488425 100644 --- a/app/assets/javascripts/admin/addon/templates/backups-index.hbs +++ b/app/assets/javascripts/admin/addon/templates/backups-index.hbs @@ -1,14 +1,18 @@
{{#if localBackupStorage}} - {{resumable-upload - target="/admin/backups/upload" - success=(route-action "uploadSuccess") - error=(route-action "uploadError") - uploadText=uploadLabel - title="admin.backups.upload.title" - class="btn-default"}} + {{#if siteSettings.enable_experimental_backup_uploader}} + {{uppy-backup-uploader done=(route-action "uploadSuccess") localBackupStorage=localBackupStorage}} + {{else}} + {{resumable-upload + target="/admin/backups/upload" + success=(route-action "uploadSuccess") + error=(route-action "uploadError") + uploadText=uploadLabel + title="admin.backups.upload.title" + class="btn-default"}} + {{/if}} {{else}} - {{#if enableExperimentalBackupUploader}} + {{#if (and siteSettings.enable_direct_s3_uploads siteSettings.enable_experimental_backup_uploader)}} {{uppy-backup-uploader done=(route-action "remoteUploadSuccess")}} {{else}} {{backup-uploader done=(route-action "remoteUploadSuccess")}} diff --git a/app/assets/javascripts/discourse-shims.js b/app/assets/javascripts/discourse-shims.js index 006a98ed69..5870456b45 100644 --- a/app/assets/javascripts/discourse-shims.js +++ b/app/assets/javascripts/discourse-shims.js @@ -45,3 +45,19 @@ define("@uppy/xhr-upload", ["exports"], function (__exports__) { define("@uppy/drop-target", ["exports"], function (__exports__) { __exports__.default = window.Uppy.DropTarget; }); + +define("@uppy/utils/lib/delay", ["exports"], function (__exports__) { + __exports__.default = window.Uppy.Utils.delay; +}); + +define("@uppy/utils/lib/EventTracker", ["exports"], function (__exports__) { + __exports__.default = window.Uppy.Utils.EventTracker; +}); + +define("@uppy/utils/lib/AbortController", ["exports"], function (__exports__) { + __exports__.AbortController = + window.Uppy.Utils.AbortControllerLib.AbortController; + __exports__.AbortSignal = window.Uppy.Utils.AbortControllerLib.AbortSignal; + __exports__.createAbortError = + window.Uppy.Utils.AbortControllerLib.createAbortError; +}); diff --git a/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js b/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js index 55be0926b7..ac07d28a40 100644 --- a/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js +++ b/app/assets/javascripts/discourse/app/components/uppy-backup-uploader.js @@ -1,13 +1,29 @@ import Component from "@ember/component"; +import { alias, not } from "@ember/object/computed"; import I18n from "I18n"; import UppyUploadMixin from "discourse/mixins/uppy-upload"; import discourseComputed from "discourse-common/utils/decorators"; export default Component.extend(UppyUploadMixin, { + id: "uppy-backup-uploader", tagName: "span", type: "backup", - useMultipartUploadsIfAvailable: true, + uploadRootPath: "/admin/backups", + uploadUrl: "/admin/backups/upload", + + // TODO (martin) Add functionality to make this usable _without_ multipart + // uploads, direct to S3, which needs to call get-presigned-put on the + // BackupsController (which extends ExternalUploadHelpers) rather than + // the old create_upload_url route. The two are functionally equivalent; + // they both generate a presigned PUT url for the upload to S3, and do + // the whole thing in one request rather than multipart. + + // direct s3 backups + useMultipartUploadsIfAvailable: not("localBackupStorage"), + + // local backups + useChunkedUploads: alias("localBackupStorage"), @discourseComputed("uploading", "uploadProgress") uploadButtonText(uploading, progress) { @@ -20,7 +36,7 @@ export default Component.extend(UppyUploadMixin, { return { skipValidation: true }; }, - uploadDone() { - this.done(); + uploadDone(responseData) { + this.done(responseData.file_name); }, }); diff --git a/app/assets/javascripts/discourse/app/lib/uppy-chunked-upload.js b/app/assets/javascripts/discourse/app/lib/uppy-chunked-upload.js new file mode 100644 index 0000000000..73edc96f0e --- /dev/null +++ b/app/assets/javascripts/discourse/app/lib/uppy-chunked-upload.js @@ -0,0 +1,339 @@ +import { Promise } from "rsvp"; +import delay from "@uppy/utils/lib/delay"; +import { + AbortController, + createAbortError, +} from "@uppy/utils/lib/AbortController"; + +const MB = 1024 * 1024; + +const defaultOptions = { + limit: 5, + retryDelays: [0, 1000, 3000, 5000], + getChunkSize() { + return 5 * MB; + }, + onStart() {}, + onProgress() {}, + onChunkComplete() {}, + onSuccess() {}, + onError(err) { + throw err; + }, +}; + +/** + * Used mainly as a replacement for Resumable.js, using code cribbed from + * uppy's S3 Multipart class, which we mainly use the chunking algorithm + * and retry/abort functions of. The _buildFormData function is the one + * which shapes the data into the same parameters as Resumable.js used. + * + * See the UppyChunkedUploader class for the uppy uploader plugin which + * uses UppyChunkedUpload. + */ +export default class UppyChunkedUpload { + constructor(file, options) { + this.options = { + ...defaultOptions, + ...options, + }; + this.file = file; + + if (!this.options.getChunkSize) { + this.options.getChunkSize = defaultOptions.getChunkSize; + this.chunkSize = this.options.getChunkSize(this.file); + } + + this.abortController = new AbortController(); + this._initChunks(); + } + + _aborted() { + return this.abortController.signal.aborted; + } + + _initChunks() { + this.chunksInProgress = 0; + this.chunks = null; + this.chunkState = null; + + const chunks = []; + + if (this.file.size === 0) { + chunks.push(this.file.data); + } else { + for (let i = 0; i < this.file.data.size; i += this.chunkSize) { + const end = Math.min(this.file.data.size, i + this.chunkSize); + chunks.push(this.file.data.slice(i, end)); + } + } + + this.chunks = chunks; + this.chunkState = chunks.map(() => ({ + bytesUploaded: 0, + busy: false, + done: false, + })); + } + + _createUpload() { + if (this._aborted()) { + throw createAbortError(); + } + this.options.onStart(); + this._uploadChunks(); + } + + _uploadChunks() { + if (this.chunkState.every((state) => state.done)) { + this._completeUpload(); + return; + } + + // For a 100MB file, with the default min chunk size of 5MB and a limit of 10: + // + // Total 20 chunks + // --------- + // Need 1 is 10 + // Need 2 is 5 + // Need 3 is 5 + const need = this.options.limit - this.chunksInProgress; + const completeChunks = this.chunkState.filter((state) => state.done).length; + const remainingChunks = this.chunks.length - completeChunks; + let minNeeded = Math.ceil(this.options.limit / 2); + if (minNeeded > remainingChunks) { + minNeeded = remainingChunks; + } + if (need < minNeeded) { + return; + } + + const candidates = []; + for (let i = 0; i < this.chunkState.length; i++) { + const state = this.chunkState[i]; + if (!state.done && !state.busy) { + candidates.push(i); + if (candidates.length >= need) { + break; + } + } + } + + if (candidates.length === 0) { + return; + } + + candidates.forEach((index) => { + this._uploadChunkRetryable(index).then( + () => { + this._uploadChunks(); + }, + (err) => { + this._onError(err); + } + ); + }); + } + + _shouldRetry(err) { + if (err.source && typeof err.source.status === "number") { + const { status } = err.source; + // 0 probably indicates network failure + return ( + status === 0 || + status === 409 || + status === 423 || + (status >= 500 && status < 600) + ); + } + return false; + } + + _retryable({ before, attempt, after }) { + const { retryDelays } = this.options; + const { signal } = this.abortController; + + if (before) { + before(); + } + + const doAttempt = (retryAttempt) => + attempt().catch((err) => { + if (this._aborted()) { + throw createAbortError(); + } + + if (this._shouldRetry(err) && retryAttempt < retryDelays.length) { + return delay(retryDelays[retryAttempt], { signal }).then(() => + doAttempt(retryAttempt + 1) + ); + } + throw err; + }); + + return doAttempt(0).then( + (result) => { + if (after) { + after(); + } + return result; + }, + (err) => { + if (after) { + after(); + } + throw err; + } + ); + } + + _uploadChunkRetryable(index) { + return this._retryable({ + before: () => { + this.chunksInProgress += 1; + }, + attempt: () => this._uploadChunk(index), + after: () => { + this.chunksInProgress -= 1; + }, + }); + } + + _uploadChunk(index) { + this.chunkState[index].busy = true; + + if (this._aborted()) { + this.chunkState[index].busy = false; + throw createAbortError(); + } + + return this._uploadChunkBytes( + index, + this.options.url, + this.options.headers + ); + } + + _onChunkProgress(index, sent) { + this.chunkState[index].bytesUploaded = parseInt(sent, 10); + + const totalUploaded = this.chunkState.reduce( + (total, chunk) => total + chunk.bytesUploaded, + 0 + ); + this.options.onProgress(totalUploaded, this.file.data.size); + } + + _onChunkComplete(index) { + this.chunkState[index].done = true; + this.options.onChunkComplete(index); + } + + _uploadChunkBytes(index, url, headers) { + const body = this.chunks[index]; + const { signal } = this.abortController; + + return new Promise((resolve, reject) => { + const xhr = new XMLHttpRequest(); + function cleanup() { + signal.removeEventListener("abort", () => xhr.abort()); + } + signal.addEventListener("abort", xhr.abort()); + + xhr.open(this.options.method || "POST", url, true); + if (headers) { + Object.keys(headers).forEach((key) => { + xhr.setRequestHeader(key, headers[key]); + }); + } + xhr.responseType = "text"; + xhr.upload.addEventListener("progress", (ev) => { + if (!ev.lengthComputable) { + return; + } + + this._onChunkProgress(index, ev.loaded, ev.total); + }); + + xhr.addEventListener("abort", () => { + cleanup(); + this.chunkState[index].busy = false; + + reject(createAbortError()); + }); + + xhr.addEventListener("load", (ev) => { + cleanup(); + this.chunkState[index].busy = false; + + if (ev.target.status < 200 || ev.target.status >= 300) { + const error = new Error("Non 2xx"); + error.source = ev.target; + reject(error); + return; + } + + // This avoids the net::ERR_OUT_OF_MEMORY in Chromium Browsers. + this.chunks[index] = null; + + this._onChunkProgress(index, body.size, body.size); + + this._onChunkComplete(index); + resolve(); + }); + + xhr.addEventListener("error", (ev) => { + cleanup(); + this.chunkState[index].busy = false; + + const error = new Error("Unknown error"); + error.source = ev.target; + reject(error); + }); + + xhr.send(this._buildFormData(index + 1, body)); + }); + } + + async _completeUpload() { + this.options.onSuccess(); + } + + _buildFormData(currentChunkNumber, body) { + const uniqueIdentifier = + this.file.data.size + + "-" + + this.file.data.name.replace(/[^0-9a-zA-Z_-]/gim, ""); + const formData = new FormData(); + formData.append("file", body); + formData.append("resumableChunkNumber", currentChunkNumber); + formData.append("resumableCurrentChunkSize", body.size); + formData.append("resumableChunkSize", this.chunkSize); + formData.append("resumableTotalSize", this.file.data.size); + formData.append("resumableFilename", this.file.data.name); + formData.append("resumableIdentifier", uniqueIdentifier); + return formData; + } + + _abortUpload() { + this.abortController.abort(); + } + + _onError(err) { + if (err && err.name === "AbortError") { + return; + } + + this.options.onError(err); + } + + start() { + this._createUpload(); + } + + abort(opts = undefined) { + if (opts?.really) { + this._abortUpload(); + } + } +} diff --git a/app/assets/javascripts/discourse/app/lib/uppy-chunked-uploader-plugin.js b/app/assets/javascripts/discourse/app/lib/uppy-chunked-uploader-plugin.js new file mode 100644 index 0000000000..44ec635856 --- /dev/null +++ b/app/assets/javascripts/discourse/app/lib/uppy-chunked-uploader-plugin.js @@ -0,0 +1,211 @@ +import { UploaderPlugin } from "discourse/lib/uppy-plugin-base"; +import { next } from "@ember/runloop"; +import getURL from "discourse-common/lib/get-url"; +import { Promise } from "rsvp"; +import UppyChunkedUpload from "discourse/lib/uppy-chunked-upload"; +import EventTracker from "@uppy/utils/lib/EventTracker"; + +// Limited use uppy uploader function to replace Resumable.js, which +// is only used by the local backup uploader at this point in time, +// and has been that way for many years. Uses the skeleton of uppy's +// AwsS3Multipart uploader plugin to provide a similar API, with unnecessary +// code removed. +// +// See also UppyChunkedUpload class for more detail. +export default class UppyChunkedUploader extends UploaderPlugin { + static pluginId = "uppy-chunked-uploader"; + + constructor(uppy, opts) { + super(uppy, opts); + const defaultOptions = { + limit: 0, + retryDelays: [0, 1000, 3000, 5000], + }; + + this.opts = { ...defaultOptions, ...opts }; + this.url = getURL(opts.url); + this.method = opts.method || "POST"; + + this.uploaders = Object.create(null); + this.uploaderEvents = Object.create(null); + } + + _resetUploaderReferences(fileID, opts = {}) { + if (this.uploaders[fileID]) { + this.uploaders[fileID].abort({ really: opts.abort || false }); + this.uploaders[fileID] = null; + } + if (this.uploaderEvents[fileID]) { + this.uploaderEvents[fileID].remove(); + this.uploaderEvents[fileID] = null; + } + } + + _uploadFile(file) { + return new Promise((resolve, reject) => { + const onStart = () => { + this.uppy.emit("upload-started", file); + }; + + const onProgress = (bytesUploaded, bytesTotal) => { + this.uppy.emit("upload-progress", file, { + uploader: this, + bytesUploaded, + bytesTotal, + }); + }; + + const onError = (err) => { + this.uppy.log(err); + this.uppy.emit("upload-error", file, err); + + this._resetUploaderReferences(file.id); + reject(err); + }; + + const onSuccess = () => { + this._resetUploaderReferences(file.id); + + const cFile = this.uppy.getFile(file.id); + const uploadResponse = {}; + this.uppy.emit("upload-success", cFile || file, uploadResponse); + + resolve(upload); + }; + + const onChunkComplete = (chunk) => { + const cFile = this.uppy.getFile(file.id); + if (!cFile) { + return; + } + + this.uppy.emit("chunk-uploaded", cFile, chunk); + }; + + const upload = new UppyChunkedUpload(file, { + getChunkSize: this.opts.getChunkSize + ? this.opts.getChunkSize.bind(this) + : null, + + onStart, + onProgress, + onChunkComplete, + onSuccess, + onError, + + limit: this.opts.limit || 5, + retryDelays: this.opts.retryDelays || [], + method: this.method, + url: this.url, + headers: this.opts.headers, + }); + + this.uploaders[file.id] = upload; + this.uploaderEvents[file.id] = new EventTracker(this.uppy); + + next(() => { + if (!file.isPaused) { + upload.start(); + } + }); + + this._onFileRemove(file.id, (removed) => { + this._resetUploaderReferences(file.id, { abort: true }); + resolve(`upload ${removed.id} was removed`); + }); + + this._onCancelAll(file.id, () => { + this._resetUploaderReferences(file.id, { abort: true }); + resolve(`upload ${file.id} was canceled`); + }); + + this._onFilePause(file.id, (isPaused) => { + if (isPaused) { + upload.pause(); + } else { + next(() => { + upload.start(); + }); + } + }); + + this._onPauseAll(file.id, () => { + upload.pause(); + }); + + this._onResumeAll(file.id, () => { + if (file.error) { + upload.abort(); + } + next(() => { + upload.start(); + }); + }); + + // Don't double-emit upload-started for restored files that were already started + if (!file.progress.uploadStarted || !file.isRestored) { + this.uppy.emit("upload-started", file); + } + }); + } + + _onFileRemove(fileID, cb) { + this.uploaderEvents[fileID].on("file-removed", (file) => { + if (fileID === file.id) { + cb(file.id); + } + }); + } + + _onFilePause(fileID, cb) { + this.uploaderEvents[fileID].on("upload-pause", (targetFileID, isPaused) => { + if (fileID === targetFileID) { + cb(isPaused); + } + }); + } + + _onPauseAll(fileID, cb) { + this.uploaderEvents[fileID].on("pause-all", () => { + if (!this.uppy.getFile(fileID)) { + return; + } + cb(); + }); + } + + _onCancelAll(fileID, cb) { + this.uploaderEvents[fileID].on("cancel-all", () => { + if (!this.uppy.getFile(fileID)) { + return; + } + cb(); + }); + } + + _onResumeAll(fileID, cb) { + this.uploaderEvents[fileID].on("resume-all", () => { + if (!this.uppy.getFile(fileID)) { + return; + } + cb(); + }); + } + + _upload(fileIDs) { + const promises = fileIDs.map((id) => { + const file = this.uppy.getFile(id); + return this._uploadFile(file); + }); + + return Promise.all(promises); + } + + install() { + this._install(this._upload.bind(this)); + } + + uninstall() { + this._uninstall(this._upload.bind(this)); + } +} diff --git a/app/assets/javascripts/discourse/app/lib/uppy-plugin-base.js b/app/assets/javascripts/discourse/app/lib/uppy-plugin-base.js index f7a0f87146..51e5907ebd 100644 --- a/app/assets/javascripts/discourse/app/lib/uppy-plugin-base.js +++ b/app/assets/javascripts/discourse/app/lib/uppy-plugin-base.js @@ -30,32 +30,6 @@ export class UppyPluginBase extends BasePlugin { _setFileState(fileId, state) { this.uppy.setFileState(fileId, state); } -} - -export class UploadPreProcessorPlugin extends UppyPluginBase { - static pluginType = "preprocessor"; - - constructor(uppy, opts) { - super(uppy, opts); - this.type = this.constructor.pluginType; - } - - _install(fn) { - this.uppy.addPreProcessor(fn); - } - - _uninstall(fn) { - this.uppy.removePreProcessor(fn); - } - - _emitProgress(file) { - this.uppy.emit("preprocess-progress", file, null, this.id); - } - - _emitComplete(file, skipped = false) { - this.uppy.emit("preprocess-complete", file, skipped, this.id); - return Promise.resolve(); - } _emitAllComplete(fileIds, skipped = false) { fileIds.forEach((fileId) => { @@ -82,3 +56,55 @@ export class UploadPreProcessorPlugin extends UppyPluginBase { return this._emitAllComplete(file, true); } } + +export class UploadPreProcessorPlugin extends UppyPluginBase { + static pluginType = "preprocessor"; + + constructor(uppy, opts) { + super(uppy, opts); + this.type = this.constructor.pluginType; + } + + _install(fn) { + this.uppy.addPreProcessor(fn); + } + + _uninstall(fn) { + this.uppy.removePreProcessor(fn); + } + + _emitProgress(file) { + this.uppy.emit("preprocess-progress", file, null, this.id); + } + + _emitComplete(file, skipped = false) { + this.uppy.emit("preprocess-complete", file, skipped, this.id); + return Promise.resolve(); + } +} + +export class UploaderPlugin extends UppyPluginBase { + static pluginType = "uploader"; + + constructor(uppy, opts) { + super(uppy, opts); + this.type = this.constructor.pluginType; + } + + _install(fn) { + this.uppy.addUploader(fn); + } + + _uninstall(fn) { + this.uppy.removeUploader(fn); + } + + _emitProgress(file) { + this.uppy.emit("upload-progress", file, null, this.id); + } + + _emitComplete(file, skipped = false) { + this.uppy.emit("upload-complete", file, skipped, this.id); + return Promise.resolve(); + } +} diff --git a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js index f94ca0b40e..d2de36205c 100644 --- a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js +++ b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js @@ -14,6 +14,7 @@ import XHRUpload from "@uppy/xhr-upload"; import AwsS3 from "@uppy/aws-s3"; import UppyChecksum from "discourse/lib/uppy-checksum-plugin"; import UppyS3Multipart from "discourse/mixins/uppy-s3-multipart"; +import UppyChunkedUploader from "discourse/lib/uppy-chunked-uploader-plugin"; import { on } from "discourse-common/utils/decorators"; import { warn } from "@ember/debug"; import bootbox from "bootbox"; @@ -152,7 +153,9 @@ export default Mixin.create(UppyS3Multipart, { this.setProperties({ uploading: false, processing: true }); this._completeExternalUpload(file) .then((completeResponse) => { - this.uploadDone(completeResponse); + this.uploadDone( + deepMerge(completeResponse, { file_name: file.name }) + ); if (this._inProgressUploads === 0) { this._reset(); @@ -165,7 +168,9 @@ export default Mixin.create(UppyS3Multipart, { } }); } else { - this.uploadDone(response.body); + this.uploadDone( + deepMerge(response?.body || {}, { file_name: file.name }) + ); if (this._inProgressUploads === 0) { this._reset(); } @@ -185,7 +190,8 @@ export default Mixin.create(UppyS3Multipart, { // allow these other uploaders to go direct to S3. if ( this.siteSettings.enable_direct_s3_uploads && - !this.preventDirectS3Uploads + !this.preventDirectS3Uploads && + !this.useChunkedUploads ) { if (this.useMultipartUploadsIfAvailable) { this._useS3MultipartUploads(); @@ -193,7 +199,11 @@ export default Mixin.create(UppyS3Multipart, { this._useS3Uploads(); } } else { - this._useXHRUploads(); + if (this.useChunkedUploads) { + this._useChunkedUploads(); + } else { + this._useXHRUploads(); + } } }, @@ -206,6 +216,16 @@ export default Mixin.create(UppyS3Multipart, { }); }, + _useChunkedUploads() { + this.set("usingChunkedUploads", true); + this._uppyInstance.use(UppyChunkedUploader, { + url: this._xhrUploadUrl(), + headers: { + "X-CSRF-Token": this.session.csrfToken, + }, + }); + }, + _useS3Uploads() { this.set("usingS3Uploads", true); this._uppyInstance.use(AwsS3, { @@ -251,7 +271,7 @@ export default Mixin.create(UppyS3Multipart, { _xhrUploadUrl() { return ( - getUrl(this.getWithDefault("uploadUrl", "/uploads")) + + getUrl(this.getWithDefault("uploadUrl", this.uploadRootPath)) + ".json?client_id=" + this.messageBus?.clientId ); diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index bf35016ac4..9bfd19569b 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -22,6 +22,7 @@ "@ember/test-helpers": "^2.2.0", "@glimmer/component": "^1.0.0", "@popperjs/core": "2.10.2", + "@uppy/utils": "^4.0.3", "@uppy/aws-s3": "^2.0.4", "@uppy/aws-s3-multipart": "^2.1.0", "@uppy/core": "^2.1.0", diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb index 188db1fdcc..64dfeb0ee4 100644 --- a/app/controllers/admin/backups_controller.rb +++ b/app/controllers/admin/backups_controller.rb @@ -180,13 +180,11 @@ class Admin::BackupsController < Admin::AdminController current_chunk_size = params.fetch(:resumableCurrentChunkSize).to_i previous_chunk_number = chunk_number - 1 - # path to chunk file chunk = BackupRestore::LocalBackupStore.chunk_path(identifier, filename, chunk_number) - # upload chunk HandleChunkUpload.upload_chunk(chunk, file: file) - uploaded_file_size = previous_chunk_number * chunk_size # when all chunks are uploaded + uploaded_file_size = previous_chunk_number * chunk_size if uploaded_file_size + current_chunk_size >= total_size # merge all the chunks in a background thread Jobs.enqueue_in(5.seconds, :backup_chunks_merger, filename: filename, identifier: identifier, chunks: chunk_number) diff --git a/package.json b/package.json index 10a3879b45..316c1f6565 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "@json-editor/json-editor": "^2.5.2", "@popperjs/core": "v2.10.2", "@uppy/aws-s3": "^2.0.4", + "@uppy/utils": "^4.0.3", "@uppy/aws-s3-multipart": "^2.1.0", "@uppy/core": "^2.1.0", "@uppy/drop-target": "^1.1.0", diff --git a/vendor/assets/javascripts/custom-uppy.js b/vendor/assets/javascripts/custom-uppy.js index e146b13662..964c7bc326 100644 --- a/vendor/assets/javascripts/custom-uppy.js +++ b/vendor/assets/javascripts/custom-uppy.js @@ -9,3 +9,8 @@ Uppy.XHRUpload = require('@uppy/xhr-upload') Uppy.AwsS3 = require('@uppy/aws-s3') Uppy.AwsS3Multipart = require('@uppy/aws-s3-multipart') Uppy.DropTarget = require('@uppy/drop-target') +Uppy.Utils = { + delay: require('@uppy/utils/lib/delay'), + EventTracker: require('@uppy/utils/lib/EventTracker'), + AbortControllerLib: require('@uppy/utils/lib/AbortController') +} diff --git a/vendor/assets/javascripts/uppy.js b/vendor/assets/javascripts/uppy.js index 7545f505ad..32bfb01026 100644 --- a/vendor/assets/javascripts/uppy.js +++ b/vendor/assets/javascripts/uppy.js @@ -7578,5 +7578,10 @@ Uppy.XHRUpload = require('@uppy/xhr-upload') Uppy.AwsS3 = require('@uppy/aws-s3') Uppy.AwsS3Multipart = require('@uppy/aws-s3-multipart') Uppy.DropTarget = require('@uppy/drop-target') +Uppy.Utils = { + delay: require('@uppy/utils/lib/delay'), + EventTracker: require('@uppy/utils/lib/EventTracker'), + AbortControllerLib: require('@uppy/utils/lib/AbortController') +} -},{"@uppy/aws-s3":5,"@uppy/aws-s3-multipart":3,"@uppy/core":18,"@uppy/drop-target":21,"@uppy/xhr-upload":49}]},{},[58]); +},{"@uppy/aws-s3":5,"@uppy/aws-s3-multipart":3,"@uppy/core":18,"@uppy/drop-target":21,"@uppy/utils/lib/AbortController":23,"@uppy/utils/lib/EventTracker":24,"@uppy/utils/lib/delay":29,"@uppy/xhr-upload":49}]},{},[58]); From 340901c913dc85ed054106b78d2b6dbed5e12240 Mon Sep 17 00:00:00 2001 From: Natalie Tay Date: Tue, 23 Nov 2021 11:21:31 +0800 Subject: [PATCH 055/168] DEV: Add if a user is using an Apple device in widget capabilities (#15021) * Consolidate device capability sniffing in caps --- app/assets/javascripts/discourse/app/lib/utilities.js | 6 +++--- .../app/pre-initializers/sniff-capabilities.js | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js index e075a40f81..acdc69825e 100644 --- a/app/assets/javascripts/discourse/app/lib/utilities.js +++ b/app/assets/javascripts/discourse/app/lib/utilities.js @@ -478,9 +478,9 @@ export function inCodeBlock(text, pos) { } export function translateModKey(string) { - const mac = /Mac|iPod|iPhone|iPad/.test(navigator.platform); - // Mac users are used to glyphs for shortcut keys - if (mac) { + const { isApple } = helperContext().capabilities; + // Apple device users are used to glyphs for shortcut keys + if (isApple) { string = string .replace("Shift", "\u21E7") .replace("Meta", "\u2318") diff --git a/app/assets/javascripts/discourse/app/pre-initializers/sniff-capabilities.js b/app/assets/javascripts/discourse/app/pre-initializers/sniff-capabilities.js index 7567fa5447..acc9e14fa5 100644 --- a/app/assets/javascripts/discourse/app/pre-initializers/sniff-capabilities.js +++ b/app/assets/javascripts/discourse/app/pre-initializers/sniff-capabilities.js @@ -1,4 +1,9 @@ // Initializes an object that lets us know about browser's capabilities + +const APPLE_NAVIGATOR_PLATFORMS = /iPhone|iPod|iPad|Macintosh|MacIntel/; + +const APPLE_USERAGENTDATA_PLATFORM = /macOS/; + export default { name: "sniff-capabilities", @@ -28,6 +33,11 @@ export default { (/iPhone|iPod/.test(navigator.userAgent) || caps.isIpadOS) && !window.MSStream; + caps.isApple = + APPLE_NAVIGATOR_PLATFORMS.test(navigator.platform) || + (navigator.userAgentData && + APPLE_USERAGENTDATA_PLATFORM.test(navigator.userAgentData.platform)); + caps.hasContactPicker = "contacts" in navigator && "ContactsManager" in window; caps.canVibrate = "vibrate" in navigator; From 52532758f7947369f39811f8941bff3f30cd1ba0 Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 22 Nov 2021 22:52:46 -0500 Subject: [PATCH 056/168] DEV: add plugin outlet before topic list views (#15054) --- .../discourse/app/templates/list/topic-list-item.hbr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr b/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr index f3db91aab3..da667759fa 100644 --- a/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr +++ b/app/assets/javascripts/discourse/app/templates/list/topic-list-item.hbr @@ -73,6 +73,9 @@ {{/if}} -{{number topic.views numberKey="views_long"}} + + {{raw-plugin-outlet name="topic-list-before-view-count"}} + {{number topic.views numberKey="views_long"}} + {{raw "list/activity-column" topic=topic class="num topic-list-data" tagName="td"}} From db4c52ca26ce7e82fb28998c787460623d005229 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Tue, 23 Nov 2021 14:00:23 +1000 Subject: [PATCH 057/168] DEV: Add single file progress and cancel for uppy in composer (#15053) This commit adds handlers for the composer uppy mixin to allow for cancelling individual file uploads, not just all of them at once. This is also combined with better tracking of in progress uploads along with their progress percentage, for UI that needs to be able to display the progress for individual files and also cancel individual files. To use this, a cancel button in the UI should call a function like this: ```javascript cancelSingleUpload(fileId) { this.appEvents.trigger(`${this.eventPrefix}:cancel-upload`, { fileId, }); }, ``` Additionally, the `inProgressUploads` can be shown in the UI. It is an array of objects with the file name, ID, and the progress percentage. We can add more data to this if needed down the line. --- .../app/mixins/composer-upload-uppy.js | 68 +++++++++++++++++-- .../discourse/app/mixins/uppy-s3-multipart.js | 6 ++ .../discourse/app/mixins/uppy-upload.js | 33 +++++++-- 3 files changed, 96 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js index b31587a702..316518f9de 100644 --- a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js +++ b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js @@ -1,5 +1,6 @@ import Mixin from "@ember/object/mixin"; import ExtendableUploader from "discourse/mixins/extendable-uploader"; +import EmberObject from "@ember/object"; import UppyS3Multipart from "discourse/mixins/uppy-s3-multipart"; import { deepMerge } from "discourse-common/lib/object"; import UppyChecksum from "discourse/lib/uppy-checksum-plugin"; @@ -36,6 +37,11 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { uploadRootPath: "/uploads", uploadTargetBound: false, + @bind + _cancelSingleUpload(data) { + this._uppyInstance.removeFile(data.fileId); + }, + @observes("composerModel.uploadCancelled") _cancelUpload() { if (!this.get("composerModel.uploadCancelled")) { @@ -61,6 +67,10 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { this.element.removeEventListener("paste", this.pasteEventListener); this.appEvents.off(`${this.eventPrefix}:add-files`, this._addFiles); + this.appEvents.off( + `${this.eventPrefix}:cancel-upload`, + this._cancelSingleUpload + ); this._reset(); @@ -79,13 +89,17 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { }, _bindUploadTarget() { + this.set("inProgressUploads", []); this.placeholders = {}; - this._inProgressUploads = 0; this._preProcessorStatus = {}; this.fileInputEl = document.getElementById(this.fileUploadElementId); const isPrivateMessage = this.get("composerModel.privateMessage"); this.appEvents.on(`${this.eventPrefix}:add-files`, this._addFiles); + this.appEvents.on( + `${this.eventPrefix}:cancel-upload`, + this._cancelSingleUpload + ); this._unbindUploadTarget(); this.fileInputEventListener = bindFileInputChangeListener( @@ -181,6 +195,37 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { this.set("uploadProgress", progress); }); + this._uppyInstance.on("file-removed", (file, reason) => { + file.meta.cancelled = true; + + // we handle the cancel-all event specifically, so no need + // to do anything here + if (reason === "cancel-all") { + return; + } + + this._removeInProgressUpload(file.id); + this._resetUpload(file, { removePlaceholder: true }); + if (this.inProgressUploads.length === 0) { + this.set("userCancelled", true); + this._uppyInstance.cancelAll(); + } + }); + + this._uppyInstance.on("upload-progress", (file, progress) => { + if (this.isDestroying || this.isDestroyed) { + return; + } + + const upload = this.inProgressUploads.find((upl) => upl.id === file.id); + if (upload) { + const percentage = Math.round( + (progress.bytesUploaded / progress.bytesTotal) * 100 + ); + upload.set("progress", percentage); + } + }); + this._uppyInstance.on("upload", (data) => { this._addNeedProcessing(data.fileIDs.length); @@ -194,7 +239,13 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { }); files.forEach((file) => { - this._inProgressUploads++; + this.inProgressUploads.push( + EmberObject.create({ + fileName: file.name, + id: file.id, + progress: 0, + }) + ); const placeholder = this._uploadPlaceholder(file); this.placeholders[file.id] = { uploadPlaceholder: placeholder, @@ -205,7 +256,7 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { }); this._uppyInstance.on("upload-success", (file, response) => { - this._inProgressUploads--; + this._removeInProgressUpload(file.id); let upload = response.body; const markdown = this.uploadMarkdownResolvers.reduce( (md, resolver) => resolver(upload) || md, @@ -262,7 +313,7 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { @bind _handleUploadError(file, error, response) { - this._inProgressUploads--; + this._removeInProgressUpload(file.id); this._resetUpload(file, { removePlaceholder: true }); file.meta.error = error; @@ -272,11 +323,18 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { this.appEvents.trigger(`${this.eventPrefix}:upload-error`, file); } - if (this._inProgressUploads === 0) { + if (this.inProgressUploads.length === 0) { this._reset(); } }, + _removeInProgressUpload(fileId) { + this.set( + "inProgressUploads", + this.inProgressUploads.filter((upl) => upl.id !== fileId) + ); + }, + _setupPreProcessors() { const checksumPreProcessor = { pluginClass: UppyChecksum, diff --git a/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js b/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js index 2c4d72bedd..e2d75eb06c 100644 --- a/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js +++ b/app/assets/javascripts/discourse/app/mixins/uppy-s3-multipart.js @@ -122,6 +122,10 @@ export default Mixin.create({ @bind _completeMultipartUpload(file, data) { + if (file.meta.cancelled) { + return; + } + this._uppyInstance.emit("complete-multipart", file.id); const parts = data.parts.map((part) => { return { part_number: part.PartNumber, etag: part.ETag }; @@ -159,6 +163,8 @@ export default Mixin.create({ return; } + file.meta.cancelled = true; + return ajax(getUrl(`${this.uploadRootPath}/abort-multipart.json`), { type: "POST", data: { diff --git a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js index d2de36205c..05c145d645 100644 --- a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js +++ b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js @@ -1,4 +1,5 @@ import Mixin from "@ember/object/mixin"; +import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; import { bindFileInputChangeListener, @@ -26,7 +27,7 @@ export default Mixin.create(UppyS3Multipart, { uploadProgress: 0, _uppyInstance: null, autoStartUploads: true, - _inProgressUploads: 0, + inProgressUploads: null, id: null, uploadRootPath: "/uploads", @@ -59,6 +60,7 @@ export default Mixin.create(UppyS3Multipart, { fileInputEl: this.element.querySelector(".hidden-upload-field"), }); this.set("allowMultipleFiles", this.fileInputEl.multiple); + this.set("inProgressUploads", []); this._bindFileInputChange(); @@ -143,11 +145,22 @@ export default Mixin.create(UppyS3Multipart, { }); this._uppyInstance.on("upload", (data) => { - this._inProgressUploads += data.fileIDs.length; + const files = data.fileIDs.map((fileId) => + this._uppyInstance.getFile(fileId) + ); + files.forEach((file) => { + this.inProgressUploads.push( + EmberObject.create({ + fileName: file.name, + id: file.id, + progress: 0, + }) + ); + }); }); this._uppyInstance.on("upload-success", (file, response) => { - this._inProgressUploads--; + this._removeInProgressUpload(file.id); if (this.usingS3Uploads) { this.setProperties({ uploading: false, processing: true }); @@ -157,13 +170,13 @@ export default Mixin.create(UppyS3Multipart, { deepMerge(completeResponse, { file_name: file.name }) ); - if (this._inProgressUploads === 0) { + if (this.inProgressUploads.length === 0) { this._reset(); } }) .catch((errResponse) => { displayErrorForUpload(errResponse, this.siteSettings, file.name); - if (this._inProgressUploads === 0) { + if (this.inProgressUploads.length === 0) { this._reset(); } }); @@ -171,13 +184,14 @@ export default Mixin.create(UppyS3Multipart, { this.uploadDone( deepMerge(response?.body || {}, { file_name: file.name }) ); - if (this._inProgressUploads === 0) { + if (this.inProgressUploads.length === 0) { this._reset(); } } }); this._uppyInstance.on("upload-error", (file, error, response) => { + this._removeInProgressUpload(file.id); displayErrorForUpload(response || error, this.siteSettings, file.name); this._reset(); }); @@ -316,4 +330,11 @@ export default Mixin.create(UppyS3Multipart, { }); this.fileInputEl.value = ""; }, + + _removeInProgressUpload(fileId) { + this.set( + "inProgressUploads", + this.inProgressUploads.filter((upl) => upl.id !== fileId) + ); + }, }); From 8226ab1099ebdb05403ba27c25921e25e269c031 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Tue, 23 Nov 2021 12:51:54 +0800 Subject: [PATCH 058/168] PERF: Updating first unread PM for user not respecting limits. (#15056) In b8c8909a9d38039782283c5f0305671b72774ad9, we introduced a regression where users may have had their `UserStat.first_unread_pm_at` set incorrectly. This commit introduces a migration to reset `UserStat.first_unread_pm_at` back to `User#created_at`. Follow-up to b8c8909a9d38039782283c5f0305671b72774ad9. --- app/models/user_stat.rb | 8 +++ ...1_reset_first_unread_pm_at_on_user_stat.rb | 16 ++++++ spec/models/user_stat_spec.rb | 53 +++++++++++++++---- 3 files changed, 67 insertions(+), 10 deletions(-) create mode 100644 db/migrate/20211123033311_reset_first_unread_pm_at_on_user_stat.rb diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb index e39ca94aea..e6cab54c24 100644 --- a/app/models/user_stat.rb +++ b/app/models/user_stat.rb @@ -53,6 +53,14 @@ class UserStat < ActiveRecord::Base ) GROUP BY tau.user_id ) AS X ON X.user_id = u1.id + WHERE u1.id IN ( + SELECT id + FROM users + WHERE last_seen_at IS NOT NULL + AND last_seen_at > :last_seen + ORDER BY last_seen_at DESC + LIMIT :limit + ) ) AS Z WHERE us.user_id = Z.user_id SQL diff --git a/db/migrate/20211123033311_reset_first_unread_pm_at_on_user_stat.rb b/db/migrate/20211123033311_reset_first_unread_pm_at_on_user_stat.rb new file mode 100644 index 0000000000..fd82316071 --- /dev/null +++ b/db/migrate/20211123033311_reset_first_unread_pm_at_on_user_stat.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class ResetFirstUnreadPmAtOnUserStat < ActiveRecord::Migration[6.1] + def up + execute <<~SQL + UPDATE user_stats us + SET first_unread_pm_at = u.created_at + FROM users u + WHERE u.id = us.user_id + SQL + end + + def down + raise ActiveRecord::IrreversibleMigration + end +end diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb index 3a3a0a56fd..1d99b5b063 100644 --- a/spec/models/user_stat_spec.rb +++ b/spec/models/user_stat_spec.rb @@ -90,6 +90,8 @@ describe UserStat do end it 'updates first unread pm timestamp correctly' do + freeze_time + pm_topic = Fabricate(:private_message_topic) user = pm_topic.user user.update!(last_seen_at: Time.zone.now) @@ -107,26 +109,57 @@ describe UserStat do notification_level: TopicUser.notification_levels[:regular] ) - # User that has not been seen - user_3 = Fabricate(:user) + # User that has not been seen recently + user_3 = Fabricate(:user, last_seen_at: 1.year.ago) pm_topic.allowed_users << user_3 TopicUser.change(user_3.id, pm_topic.id, notification_level: TopicUser.notification_levels[:tracking] ) - freeze_time 10.minutes.from_now + user_3_orig_first_unread_pm_at = user_3.user_stat.first_unread_pm_at - post = create_post( - user: Fabricate(:admin), - topic_id: pm_topic.id + # User that is not related to the PM + user_4 = Fabricate(:user, last_seen_at: Time.zone.now) + user_4_orig_first_unread_pm_at = user_4.user_stat.first_unread_pm_at + + # User for another PM topic + pm_topic_2 = Fabricate(:private_message_topic) + user_5 = pm_topic_2.user + user_5.update!(last_seen_at: Time.zone.now) + create_post(user: user_5, topic_id: pm_topic_2.id) + + TopicUser.change(user_5.id, pm_topic_2.id, + notification_level: TopicUser.notification_levels[:tracking] ) - UserStat.ensure_consistency! + # User out of last seen limit + user_6 = Fabricate(:user, last_seen_at: Time.zone.now) + pm_topic.allowed_users << user_6 + create_post(user: user_6, topic_id: pm_topic.id) - expect(user.user_stat.reload.first_unread_pm_at).to eq_time(post.topic.updated_at) - expect(user_2.user_stat.reload.first_unread_pm_at).to_not eq_time(post.topic.updated_at) - expect(user_3.user_stat.reload.first_unread_pm_at).to_not eq_time(post.topic.updated_at) + TopicUser.change(user_6.id, pm_topic.id, + notification_level: TopicUser.notification_levels[:tracking] + ) + + user_6_orig_first_unread_pm_at = user_6.user_stat.first_unread_pm_at + + admin = Fabricate(:admin) + create_post(user: admin, topic_id: pm_topic.id) + create_post(user: admin, topic_id: pm_topic_2.id) + pm_topic.update!(updated_at: 10.minutes.from_now) + pm_topic_2.update!(updated_at: 20.minutes.from_now) + + stub_const(UserStat, "UPDATE_UNREAD_USERS_LIMIT", 4) do + UserStat.ensure_consistency! + end + + expect(user.user_stat.reload.first_unread_pm_at).to eq_time(pm_topic.reload.updated_at) + expect(user_2.user_stat.reload.first_unread_pm_at).to eq_time(UserStat::UPDATE_UNREAD_MINUTES_AGO.minutes.ago) + expect(user_3.user_stat.reload.first_unread_pm_at).to eq_time(user_3_orig_first_unread_pm_at) + expect(user_4.user_stat.reload.first_unread_pm_at).to eq_time(UserStat::UPDATE_UNREAD_MINUTES_AGO.minutes.ago) + expect(user_5.user_stat.reload.first_unread_pm_at).to eq_time(pm_topic_2.reload.updated_at) + expect(user_6.user_stat.reload.first_unread_pm_at).to eq_time(user_6_orig_first_unread_pm_at) end end From adf6498fe21ac5d763e59187f1e92e9d0d2d637a Mon Sep 17 00:00:00 2001 From: Natalie Tay Date: Tue, 23 Nov 2021 13:11:17 +0800 Subject: [PATCH 059/168] FEATURE: Show browser search tip when discourse search shows up in a topic (#15055) --- .../discourse/app/widgets/search-menu.js | 25 ++++++++++++++- .../stylesheets/common/base/search-menu.scss | 31 +++++++++++-------- config/locales/client.en.yml | 2 ++ 3 files changed, 44 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js index 4b52448038..8a76a33014 100644 --- a/app/assets/javascripts/discourse/app/widgets/search-menu.js +++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js @@ -5,13 +5,14 @@ import discourseDebounce from "discourse-common/lib/debounce"; import getURL from "discourse-common/lib/get-url"; import { h } from "virtual-dom"; import { iconNode } from "discourse-common/lib/icon-library"; -import { isiPad } from "discourse/lib/utilities"; +import { isiPad, translateModKey } from "discourse/lib/utilities"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { Promise } from "rsvp"; import { search as searchCategoryTag } from "discourse/lib/category-tag-search"; import userSearch from "discourse/lib/user-search"; import { CANCELLED_STATUS } from "discourse/lib/autocomplete"; import { cancel } from "@ember/runloop"; +import I18n from "I18n"; const CATEGORY_SLUG_REGEXP = /(\#[a-zA-Z0-9\-:]*)$/gi; const USERNAME_REGEXP = /(\@[a-zA-Z0-9\-\_]*)$/gi; @@ -279,6 +280,11 @@ export default createWidget("search-menu", { this.state.inTopicContext && (!SearchHelper.includesTopics() || !searchData.term) ) { + const isMobileDevice = this.site.isMobileDevice; + + if (!isMobileDevice) { + results.push(this.attach("browser-search-tip")); + } return results; } @@ -500,3 +506,20 @@ export default createWidget("search-menu", { return false; }, }); + +createWidget("browser-search-tip", { + buildKey: () => "browser-search-tip", + tagName: "div.browser-search-tip", + + html() { + return [ + h( + "span.tip-label", + I18n.t("search.browser_tip", { + modifier: translateModKey("Meta"), + }) + ), + h("span.tip-description", I18n.t("search.browser_tip_description")), + ]; + }, +}); diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss index 8d678dba47..32935f37a8 100644 --- a/app/assets/stylesheets/common/base/search-menu.scss +++ b/app/assets/stylesheets/common/base/search-menu.scss @@ -242,24 +242,29 @@ $search-pad-horizontal: 0.5em; } } } + } - .search-random-quick-tip { - padding: $search-pad-vertical $search-pad-horizontal; - padding-bottom: 0; - font-size: var(--font-down-2); - color: var(--primary-medium); - .tip-label { - background-color: rgba(var(--tertiary-rgb), 0.1); - margin-right: 4px; - padding: 2px 4px; - display: inline-block; - &.tip-clickable { - cursor: pointer; - } + .browser-search-tip, + .search-random-quick-tip { + padding: $search-pad-vertical $search-pad-horizontal; + padding-bottom: 0; + font-size: var(--font-down-2); + color: var(--primary-medium); + .tip-label { + background-color: rgba(var(--tertiary-rgb), 0.1); + margin-right: 4px; + padding: 2px 4px; + display: inline-block; + &.tip-clickable { + cursor: pointer; } } } + .browser-search-tip { + padding-top: 0.5em; + } + .searching { position: absolute; top: $search-pad-vertical + 0.2em; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 431c046b23..5546027cd1 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2379,6 +2379,8 @@ en: in_topics_posts: "in all topics and posts" enter_hint: "or press Enter" in_posts_by: "in posts by %{username}" + browser_tip: "%{modifier} + f" + browser_tip_description: "again to use native browser search" type: default: "Topics/posts" From c0f278d358001a4ed99a8db0084bb432ebe50c13 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Tue, 23 Nov 2021 15:26:55 +0800 Subject: [PATCH 060/168] DEV: Fix flaky specs due to 8226ab1099ebdb05403ba27c25921e25e269c031. (#15060) The users all shared the same `User#last_seen_at` column so depending on how the database returned the records, the user that we're interested in may be excluded from the update query. Follow-up to 8226ab1099ebdb05403ba27c25921e25e269c031 --- spec/models/user_stat_spec.rb | 38 ++++++++++++++--------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb index 1d99b5b063..3bc9189980 100644 --- a/spec/models/user_stat_spec.rb +++ b/spec/models/user_stat_spec.rb @@ -90,11 +90,9 @@ describe UserStat do end it 'updates first unread pm timestamp correctly' do - freeze_time - - pm_topic = Fabricate(:private_message_topic) - user = pm_topic.user - user.update!(last_seen_at: Time.zone.now) + user = Fabricate(:user, last_seen_at: Time.zone.now) + user_2 = Fabricate(:user, last_seen_at: Time.zone.now) + pm_topic = Fabricate(:private_message_topic, user: user, recipient: user_2) create_post(user: user, topic_id: pm_topic.id) TopicUser.change(user.id, pm_topic.id, @@ -102,9 +100,6 @@ describe UserStat do ) # user that is not tracking PM topic - user_2 = Fabricate(:user, last_seen_at: Time.zone.now) - pm_topic.allowed_users << user_2 - TopicUser.change(user_2.id, pm_topic.id, notification_level: TopicUser.notification_levels[:regular] ) @@ -124,9 +119,9 @@ describe UserStat do user_4_orig_first_unread_pm_at = user_4.user_stat.first_unread_pm_at # User for another PM topic - pm_topic_2 = Fabricate(:private_message_topic) - user_5 = pm_topic_2.user - user_5.update!(last_seen_at: Time.zone.now) + user_5 = Fabricate(:user, last_seen_at: Time.zone.now) + user_6 = Fabricate(:user, last_seen_at: 10.minutes.ago) + pm_topic_2 = Fabricate(:private_message_topic, user: user_5, recipient: user_6) create_post(user: user_5, topic_id: pm_topic_2.id) TopicUser.change(user_5.id, pm_topic_2.id, @@ -134,30 +129,27 @@ describe UserStat do ) # User out of last seen limit - user_6 = Fabricate(:user, last_seen_at: Time.zone.now) - pm_topic.allowed_users << user_6 - create_post(user: user_6, topic_id: pm_topic.id) - - TopicUser.change(user_6.id, pm_topic.id, + TopicUser.change(user_6.id, pm_topic_2.id, notification_level: TopicUser.notification_levels[:tracking] ) + create_post(user: user_6, topic_id: pm_topic_2.id) user_6_orig_first_unread_pm_at = user_6.user_stat.first_unread_pm_at - admin = Fabricate(:admin) - create_post(user: admin, topic_id: pm_topic.id) - create_post(user: admin, topic_id: pm_topic_2.id) + create_post(user: user_2, topic_id: pm_topic.id) + create_post(user: user_6, topic_id: pm_topic_2.id) pm_topic.update!(updated_at: 10.minutes.from_now) pm_topic_2.update!(updated_at: 20.minutes.from_now) stub_const(UserStat, "UPDATE_UNREAD_USERS_LIMIT", 4) do - UserStat.ensure_consistency! + UserStat.ensure_consistency!(1.hour.ago) end - expect(user.user_stat.reload.first_unread_pm_at).to eq_time(pm_topic.reload.updated_at) - expect(user_2.user_stat.reload.first_unread_pm_at).to eq_time(UserStat::UPDATE_UNREAD_MINUTES_AGO.minutes.ago) + # User affected + expect(user.user_stat.reload.first_unread_pm_at).to be_within(1.seconds).of(pm_topic.reload.updated_at) + expect(user_2.user_stat.reload.first_unread_pm_at).to be_within(1.seconds).of(UserStat::UPDATE_UNREAD_MINUTES_AGO.minutes.ago) expect(user_3.user_stat.reload.first_unread_pm_at).to eq_time(user_3_orig_first_unread_pm_at) - expect(user_4.user_stat.reload.first_unread_pm_at).to eq_time(UserStat::UPDATE_UNREAD_MINUTES_AGO.minutes.ago) + expect(user_4.user_stat.reload.first_unread_pm_at).to be_within(1.seconds).of(UserStat::UPDATE_UNREAD_MINUTES_AGO.minutes.ago) expect(user_5.user_stat.reload.first_unread_pm_at).to eq_time(pm_topic_2.reload.updated_at) expect(user_6.user_stat.reload.first_unread_pm_at).to eq_time(user_6_orig_first_unread_pm_at) end From 948a1523ea9fb2b4d0dfbc54ee0edb703e3a3943 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Tue, 23 Nov 2021 13:00:45 +0200 Subject: [PATCH 061/168] FIX: Keep existent tags when editing tag topics (#15050) Allow current user to keep existent tags when adding or removing a tag. For example, a user could not remove a tag from a topic if the topic had another tag that was restricted to a different category. --- lib/discourse_tagging.rb | 3 +++ spec/components/discourse_tagging_spec.rb | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb index 96dd3274a4..16e240ade5 100644 --- a/lib/discourse_tagging.rb +++ b/lib/discourse_tagging.rb @@ -77,6 +77,9 @@ module DiscourseTagging only_tag_names: tag_names ) + # keep existent tags that current user cannot use + tags += Tag.where(name: old_tag_names & tag_names) + tags = Tag.where(id: tags.map(&:id)).all.to_a if tags.size > 0 if tags.size < tag_names.size && (category.nil? || category.allow_global_tags || (category.tags.count == 0 && category.tag_groups.count == 0)) diff --git a/spec/components/discourse_tagging_spec.rb b/spec/components/discourse_tagging_spec.rb index 815e399d26..5ef7c3e7ee 100644 --- a/spec/components/discourse_tagging_spec.rb +++ b/spec/components/discourse_tagging_spec.rb @@ -383,6 +383,18 @@ describe DiscourseTagging do expect(topic.tags.pluck(:name)).to be_blank end + it 'can remove tags and keep existent ones' do + tag1 = Fabricate(:tag) + tag2 = Fabricate(:tag) + topic = Fabricate(:topic, tags: [tag1, tag2]) + Fabricate(:category, allowed_tags: [tag1.name]) + + result = DiscourseTagging.tag_topic_by_names(topic, Guardian.new(admin), [tag1.name]) + + expect(result).to eq(true) + expect(topic.reload.tags.pluck(:name)).to eq([tag1.name]) + end + context 'respects category minimum_required_tags setting' do fab!(:category) { Fabricate(:category, minimum_required_tags: 2) } fab!(:topic) { Fabricate(:topic, category: category) } From c749b411639ab48f9dd08cb65404dc8de7ebe354 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 23 Nov 2021 11:12:54 +0000 Subject: [PATCH 062/168] UX: Fallback to regular title if screen-reader title is unavailable (#15048) c401d641 introduced a new translation key for auth providers, and provided new strings for core providers. However, not all plugins have added this string. This commit makes the screenreader title fallback to the regular title in those cases. --- app/assets/javascripts/discourse/app/models/login-method.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/models/login-method.js b/app/assets/javascripts/discourse/app/models/login-method.js index 113482d8e0..0c3b516873 100644 --- a/app/assets/javascripts/discourse/app/models/login-method.js +++ b/app/assets/javascripts/discourse/app/models/login-method.js @@ -15,7 +15,10 @@ const LoginMethod = EmberObject.extend({ @discourseComputed screenReaderTitle() { - return this.title_override || I18n.t(`login.${this.name}.sr_title`); + return ( + this.title_override || + I18n.t(`login.${this.name}.sr_title`, { defaultValue: this.title }) + ); }, @discourseComputed From ff7acc9828db18eeccd6e6930e973e43dc02e9aa Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Tue, 23 Nov 2021 13:54:51 +0200 Subject: [PATCH 063/168] FIX: Git should not prompt for credentials (#15062) When cloning a public remote repository (no key), git should not prompt for credentials. --- lib/theme_store/git_importer.rb | 4 ++-- spec/components/theme_store/git_importer_spec.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/theme_store/git_importer.rb b/lib/theme_store/git_importer.rb index 15b145d0ca..409a39eca4 100644 --- a/lib/theme_store/git_importer.rb +++ b/lib/theme_store/git_importer.rb @@ -87,9 +87,9 @@ class ThemeStore::GitImporter def import_public! begin if @branch.present? - Discourse::Utils.execute_command("git", "clone", "--single-branch", "-b", @branch, @url, @temp_folder) + Discourse::Utils.execute_command({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", "--single-branch", "-b", @branch, @url, @temp_folder) else - Discourse::Utils.execute_command("git", "clone", @url, @temp_folder) + Discourse::Utils.execute_command({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", @url, @temp_folder) end rescue RuntimeError raise RemoteTheme::ImportError.new(I18n.t("themes.import_error.git")) diff --git a/spec/components/theme_store/git_importer_spec.rb b/spec/components/theme_store/git_importer_spec.rb index 46783d5c38..914ce44ffd 100644 --- a/spec/components/theme_store/git_importer_spec.rb +++ b/spec/components/theme_store/git_importer_spec.rb @@ -22,14 +22,14 @@ describe ThemeStore::GitImporter do end it "should import from http url" do - Discourse::Utils.expects(:execute_command).with("git", "clone", url, @temp_folder) + Discourse::Utils.expects(:execute_command).with({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", url, @temp_folder) importer = ThemeStore::GitImporter.new(url) importer.import! end it "should work with trailing slash url" do - Discourse::Utils.expects(:execute_command).with("git", "clone", url, @temp_folder) + Discourse::Utils.expects(:execute_command).with({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", url, @temp_folder) importer = ThemeStore::GitImporter.new(trailing_slash_url) importer.import! @@ -45,7 +45,7 @@ describe ThemeStore::GitImporter do end it "should import branch from http url" do - Discourse::Utils.expects(:execute_command).with("git", "clone", "--single-branch", "-b", branch, url, @temp_folder) + Discourse::Utils.expects(:execute_command).with({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", "--single-branch", "-b", branch, url, @temp_folder) importer = ThemeStore::GitImporter.new(url, branch: branch) importer.import! From fa2fd7fff85947c90d491ef4d52bfa8f3b90a28b Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Tue, 23 Nov 2021 13:55:09 +0200 Subject: [PATCH 064/168] FIX: Do not fail-stop if theme update fails (#15063) --- lib/tasks/themes.rake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake index cd9eda143f..d997d57997 100644 --- a/lib/tasks/themes.rake +++ b/lib/tasks/themes.rake @@ -61,14 +61,11 @@ def update_themes theme.save! unless theme.remote_theme.last_error_text.nil? puts "Error updating '#{theme.name}': #{theme.remote_theme.last_error_text}" - exit 1 end end rescue => e - STDERR.puts "Failed to update '#{theme.name}'" - STDERR.puts e + STDERR.puts "Failed to update '#{theme.name}': #{e}" STDERR.puts e.backtrace - exit 1 end end end From 34354353ffca871051236944f2012101944a382b Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Tue, 23 Nov 2021 18:07:36 +0530 Subject: [PATCH 065/168] Update email deliverability mail template (#15064) --- config/locales/server.en.yml | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index cfc7881fde..209a271b91 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2736,42 +2736,16 @@ en: [**%{base_url}**][0] - Email deliverability is complicated. Here are a few important things you should check first: - - - Be *sure* to set the `notification email` from: address correctly in your site settings. **The domain specified in the "from" address of the emails you send is the domain your email will be validated against**. - - - Know how to view the raw source of the email in your mail client, so you can examine email headers for important clues. In Gmail, it is the "show original" option in the drop-down menu at the top right of each mail. - - - **IMPORTANT:** Does your ISP have a reverse DNS record entered to associate the domain names and IP addresses you send mail from? [Test your Reverse PTR record][2] here. If your ISP does not enter the proper reverse DNS pointer record, it's very unlikely any of your email will be delivered. - - - Is your domain's [SPF record][8] correct? [Test your SPF record][1] here. Note that TXT is the correct official record type for SPF. - - - Is your domain's [DKIM record][3] correct? This will significantly improve email deliverability. [Test your DKIM record][7] here. - - - If you run your own mail server, check to make sure the IPs of your mail server are [not on any email blocklists][4]. Also verify that it is definitely sending a fully-qualified hostname that resolves in DNS in its HELO message. If not, this will cause your email to be rejected by many mail services. - - - We highly recommend you **send a test email to [mail-tester.com][mt]** to verify that all the above is working correctly. - - (The *easy* way is to create an account on [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] or [Mailjet][mj], which have low cost mailing plans and will be fine for small communities. You'll still need to set up the SPF and DKIM records in your DNS, though!) - We hope you received this email deliverability test OK! + Here is a [handy checklist for verifying email delivery configuration][1]. + Good luck, Your friends at [Discourse](https://www.discourse.org) [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ + [1]: https://meta.discourse.org/t/email-delivery-configuration-checklist/209839 new_version_mailer: title: "New Version Mailer" From 563b27b763d32fd6b9b6663eaa7c3401aacfe984 Mon Sep 17 00:00:00 2001 From: Discourse Translator Bot Date: Tue, 23 Nov 2021 11:29:39 -0500 Subject: [PATCH 066/168] Update translations (#15065) --- config/locales/client.ar.yml | 8 +- config/locales/client.be.yml | 2 + config/locales/client.bg.yml | 818 +++++++++++++++++- config/locales/client.bs_BA.yml | 3 + config/locales/client.ca.yml | 3 + config/locales/client.cs.yml | 3 + config/locales/client.da.yml | 6 +- config/locales/client.de.yml | 20 +- config/locales/client.el.yml | 3 + config/locales/client.es.yml | 8 +- config/locales/client.et.yml | 3 + config/locales/client.fa_IR.yml | 18 +- config/locales/client.fi.yml | 8 +- config/locales/client.fr.yml | 8 +- config/locales/client.gl.yml | 5 +- config/locales/client.he.yml | 20 +- config/locales/client.hu.yml | 8 +- config/locales/client.hy.yml | 3 + config/locales/client.id.yml | 65 ++ config/locales/client.it.yml | 13 +- config/locales/client.ja.yml | 8 +- config/locales/client.ko.yml | 16 +- config/locales/client.lt.yml | 11 +- config/locales/client.lv.yml | 8 +- config/locales/client.nb_NO.yml | 8 +- config/locales/client.nl.yml | 6 +- config/locales/client.pl_PL.yml | 10 +- config/locales/client.pt.yml | 34 +- config/locales/client.pt_BR.yml | 8 +- config/locales/client.ro.yml | 3 + config/locales/client.ru.yml | 36 +- config/locales/client.sk.yml | 3 + config/locales/client.sl.yml | 5 +- config/locales/client.sq.yml | 3 + config/locales/client.sr.yml | 3 + config/locales/client.sv.yml | 22 +- config/locales/client.sw.yml | 3 + config/locales/client.te.yml | 2 + config/locales/client.th.yml | 3 + config/locales/client.tr_TR.yml | 8 +- config/locales/client.uk.yml | 8 +- config/locales/client.ur.yml | 3 + config/locales/client.vi.yml | 8 +- config/locales/client.zh_CN.yml | 56 +- config/locales/client.zh_TW.yml | 3 + config/locales/server.ar.yml | 41 - config/locales/server.da.yml | 41 - config/locales/server.de.yml | 42 +- config/locales/server.es.yml | 41 - config/locales/server.fa_IR.yml | 1 + config/locales/server.fi.yml | 41 - config/locales/server.fr.yml | 41 - config/locales/server.gl.yml | 41 - config/locales/server.he.yml | 42 +- config/locales/server.it.yml | 42 +- config/locales/server.ja.yml | 41 - config/locales/server.ko.yml | 41 - config/locales/server.lt.yml | 1 + config/locales/server.pl_PL.yml | 41 - config/locales/server.pt_BR.yml | 41 - config/locales/server.ru.yml | 43 +- config/locales/server.sv.yml | 42 +- config/locales/server.zh_CN.yml | 47 +- .../config/locales/client.zh_CN.yml | 1 + plugins/poll/config/locales/client.pt.yml | 3 + plugins/poll/config/locales/client.zh_CN.yml | 3 + plugins/poll/config/locales/server.de.yml | 7 + plugins/poll/config/locales/server.he.yml | 11 + plugins/poll/config/locales/server.ko.yml | 1 + plugins/poll/config/locales/server.ru.yml | 11 + plugins/poll/config/locales/server.sv.yml | 7 + 71 files changed, 1256 insertions(+), 761 deletions(-) diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index caa328f4da..878a1b8467 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -1686,22 +1686,19 @@ ar: invite: new_title: "إنشاء دعوة" edit_title: "تعديل الدعوة" - instructions: "شارك هذا الرابط لمنح حق الوصول إلى هذا الموقع على الفور" + instructions: "شارك هذا الرابط لمنح حق الوصول إلى هذا الموقع على الفور:" copy_link: "نسخ الرابط" expires_in_time: "تنتهي صلاحيتها في %{time}" expired_at_time: "تنتهي صلاحيتها في %{time}" show_advanced: "إظهار الخيارات المتقدمة" hide_advanced: "إخفاء الخيارات المتقدمة" - restrict_email: "التقييد على عنوان بريد إلكتروني واحد" max_redemptions_allowed: "الحد الأقصى لمرات الاستخدام" add_to_groups: "إضافة إلى المجموعات" - invite_to_topic: "الوصول إلى هذا الموضوع" expires_at: "تنتهي بعد" custom_message: "رسالة خاصة اختيارية" send_invite_email: "حفظ الرسالة الإلكترونية وإرسالها" save_invite: "حفظ الدعوة" invite_saved: "تم حفظ الدعوة." - invite_copied: "تم نسخ رابط الدعوة." bulk_invite: none: "لا توجد دعوات لعرضها على هذه الصفحة." text: "دعوة جماعية" @@ -2389,6 +2386,9 @@ ar: reaction: "‏⁨%{username}⁩ ‏%{description}" reaction_2: "%{username} و%{username2} %{description}" votes_released: "%{description} - اكتمل" + dismiss_confirmation: + dismiss: "تجاهل" + cancel: "إلغاء" group_message_summary: zero: "%{count} رسالة في صندوق البريد الوارد للمجموعة %{group_name}" one: "رسالة واحدة (%{count}) في صندوق البريد الوارد للمجموعة %{group_name}" diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml index b8653f4340..d1eed7996d 100644 --- a/config/locales/client.be.yml +++ b/config/locales/client.be.yml @@ -863,6 +863,8 @@ be: label: "Стварыць новую тэму" ignore: "ігнараваць" notifications: + dismiss_confirmation: + cancel: "Адмяніць" popup: mentioned: '% {Імя карыстальніка} згадаў вас у "% {} тэме" -% {SITE_TITLE}' group_mentioned: '% {Імя карыстальніка} згадаў вас у "% {} тэме" -% {SITE_TITLE}' diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml index 5d3ab526b5..78f1b1786e 100644 --- a/config/locales/client.bg.yml +++ b/config/locales/client.bg.yml @@ -116,6 +116,8 @@ bg: previous_month: "Предишен месец" next_month: "Следващ месец" placeholder: дата + from_placeholder: "от дата" + to_placeholder: "до дата" share: topic_html: 'Тема: %{topicTitle}' post: "публикации #%{postNumber}" @@ -157,6 +159,7 @@ bg: disabled: "Тази тема вече не е банер %{when} . Тя няма да се показва най-отгоре на всяка страница." forwarded: "препрати горния имейл" topic_admin_menu: "действия по темата" + skip_to_main_content: "Прескачане към основното съдържание" wizard_required: "Добре дошли във вашия нов Discourse! Нека започнем с съветника за настройка ✨" emails_are_disabled: "Всички изходящи имейли са изцяло забранени от администратора. Няма да бъдат изпращани никакви имейл известия." software_update_prompt: @@ -179,6 +182,7 @@ bg: cn_northwest_1: "China (Ningxia)" eu_central_1: "EU (Франкфурт)" eu_north_1: "EU (Stockholm)" + eu_south_1: "ЕС (Милано)" eu_west_1: "EU (Ирландия)" eu_west_2: "EU (London)" eu_west_3: "EU (Paris)" @@ -233,6 +237,8 @@ bg: character_count: one: "%{count} символ" other: "%{count} символа" + period_chooser: + aria_label: "Филтриране по период" related_messages: title: "Свързани съобщения" see_all: 'See всички съобщения от @%{username}...' @@ -264,9 +270,15 @@ bg: clear_bookmarks: "Изчисти отметките" help: bookmark: "Щракнете за да добавите в отметки първата публикация в тази тема" + edit_bookmark: "Кликнете, за да редактирате отметката на тази тема" + edit_bookmark_for_topic: "Кликнете, за да редактирате отметката за тази тема" unbookmark: "Щракнете тук за да изтриите всички отметки в тази тема" + unbookmark_with_reminder: "Щракнете, за да премахнете всички отметки и напомняния в тази тема." bookmarks: + created: "Отбелязахте тази публикация. %{name}" not_bookmarked: "добавете тази публикация в Отметки" + remove_reminder_keep_bookmark: "Премахнете напомнянето и запазете отметката" + created_with_reminder: "Отбелязахте тази публикация с напомняне %{date}. %{name}" remove: "Премахнете отметката" delete: "Изтрийте отметката" confirm_delete: "Наистина ли искате да изтриете тази отметка? Напомнянето, свързано с нея, също ще бъде отменено." @@ -275,24 +287,43 @@ bg: no_timezone: 'Не може да получавате напомняния, защото не сте настроили своята часова зона. Може да го направите във Вашия профил.' invalid_custom_datetime: "Въведените дата и час не са валидни. Опитайте отново." list_permission_denied: "Нямате право да преглеждате отметките на този потребител." + no_user_bookmarks: "Нямате отбелязани публикации; отметките ви позволяват бързо да препращате към конкретни публикации." auto_delete_preference: label: "Автоматично изтриване" never: "Никога" + when_reminder_sent: "След като напомнянето е изпратено" + on_owner_reply: "След като отговоря на тази тема" + search_placeholder: "Търсете отметки по име, заглавие на тема или съдържание на публикация" search: "Търсене" reminders: today_with_time: "днес в %{time}" tomorrow_with_time: "утре в %{time}" at_time: "на %{date_time}" + existing_reminder: "Имате зададено напомняне за тази отметка, което ще бъде изпратено %{at_date_time}" copy_codeblock: copied: "копирано!" drafts: + label: "Чернови" + label_with_count: "Чернови (%{count})" resume: "Продължи" remove: "Премахване" + remove_confirmation: "Сигурни ли сте, че искате да изтриете тази чернова?" new_topic: "Проект на нова тема" + new_private_message: "Нова чернова на лично съобщение" topic_reply: "Проект на отговор" abandon: + confirm: "Имате чернова за тази тема. Какво бихте искали да направите с нея?" yes_value: "Отхвърляне" no_value: "Възобновете редактирането" + topic_count_categories: + one: "Вижте %{count} нова или актуализирана тема" + other: "Вижте %{count} нови или актуализирани теми" + topic_count_latest: + one: "Вижте %{count} нова или актуализирана тема" + other: "Вижте %{count} нови или актуализирани теми" + topic_count_unseen: + one: "Вижте %{count} нова или актуализирана тема" + other: "Вижте %{count} нови или актуализирани теми" topic_count_unread: one: "Виж %{count} непрочетена тема" other: "Виж %{count} непрочетени теми" @@ -308,6 +339,7 @@ bg: upload: "Качване" uploading: "Качва се..." uploading_filename: "Качване: %{filename}..." + processing_filename: "Обработка: %{filename}..." clipboard: "клипборд" uploaded: "Качено!" pasting: "Вмъкване..." @@ -328,27 +360,59 @@ bg: none_found: "Няма нови теми." title: search: "Търсене на тема" + placeholder: "въведете тук заглавието на темата, url или ID" choose_message: none_found: "Не са намерени съобщения." title: search: "Търси съобщения" + placeholder: "въведете тук заглавието на съобщението, url или ID" review: order_by: "Подреди по" + date_filter: "Публикувано в периода" in_reply_to: "в отговор на" explain: + why: "обясни защо този елемент се озова в опашката" + title: "Оценяване с възможност за преразглеждане" formula: "Формула" subtotal: "Междинна сума" total: "Общо" min_score_visibility: "Минимален брой точки за видимост" score_to_hide: "Точки за скриване на публикацията" + take_action_bonus: + name: "предприемане на действие" + title: "Когато член на персонала реши да предприеме действие, флагът получава бонус." + user_accuracy_bonus: + name: "потребителска точност" + trust_level_bonus: + name: "ниво на доверие" + title: "Елементите, които могат да се преглеждат, създадени от потребители с по-високо ниво на доверие, имат по-висок резултат." + type_bonus: + name: "тип бонус" + claim_help: + optional: "Можете да заявите този артикул, за да попречите на други да го преглеждат." + required: "Трябва да заявите артикули, преди да можете да ги прегледате." + claimed_by_you: "Заявихте този артикул и можете да го прегледате." + claimed_by_other: "Този артикул може да бъде прегледан само от %{username}." + claim: + title: "заявете тази тема" + unclaim: + help: "премахнете на тази заявка" awaiting_approval: "Очаква одобрение" delete: "Изтрий" settings: saved: "Запазено" save_changes: "Запази промените" title: "Настройки" + priorities: + title: "Прегледани приоритети" + moderation_history: "История на модерацията" view_all: "Виж всички" grouped_by_topic: "Групирани по тема" + none: "Няма артикули за преглед." + view_pending: "Преглед на изчакващи" + topic_has_pending: + one: "Тази тема има %{count} мнение в очакване на одобрение" + other: "Тази тема има %{count} мнения в очакване на одобрение" title: "Преглед" topic: "Тема:" filtered_user: "Потребител" @@ -365,6 +429,9 @@ bg: fields: "Полета" reject_reason: "Причина" user_percentage: + summary: + one: "%{agreed}, %{disagreed}, %{ignored} (от последния флаг)" + other: "%{agreed}, %{disagreed}, %{ignored} (от последните %{count} флагове)" agreed: one: "%{count}% са съгласни" other: "%{count}% са съгласни" @@ -378,6 +445,8 @@ bg: topic: "Тема" reviewable_count: "Брой" reported_by: "Докладвано от" + deleted: "[Тема е изтрита]" + original: "(оригинална тема)" details: "детайли" unique_users: one: "%{count} потребител" @@ -388,26 +457,37 @@ bg: edit: "Редактирай" save: "Запази" cancel: "Отмени" + new_topic: "Одобряването на този елемент ще създаде нова тема" filters: all_categories: "(всички категории)" type: title: "Тип" all: "(всички видове)" + minimum_score: "минимален резултат:" refresh: "Опресни" status: "Статус" category: "Категория" orders: score: "Точки" + score_asc: "Резултат (обратен)" created_at: "Създадено на" created_at_asc: "Създадено на (по обратен ред)" priority: + title: "Минимален приоритет" + any: "(всяко)" + low: "Ниска" medium: "Среден" high: "Висок" + conversation: + view_full: "вижте целия разговор" scores: + about: "Този резултат се изчислява въз основа на нивото на доверие на репортера, точността на предишните му флагове и приоритета на елемента, за който се съобщава." score: "Точки" date: "Дата" type: "Тип" status: "Статус" + submitted_by: "Изпратено от" + reviewed_by: "Прегледан от" statuses: pending: title: "Чакащи" @@ -415,9 +495,22 @@ bg: title: "Одобрена" rejected: title: "Отхвърлени" + ignored: + title: "Игнориран" deleted: title: "Изтрита" + reviewed: + title: "(всички прегледани)" + all: + title: "(всичко)" types: + reviewable_flagged_post: + title: "Маркирана публикация" + flagged_by: "Означено от" + reviewable_queued_topic: + title: "Тема на опашката" + reviewable_queued_post: + title: "Пост на опашка" reviewable_user: title: "Потребител" reviewable_post: @@ -430,19 +523,36 @@ bg: other: "Имате %{count} чакащи публикации." ok: "Ок" example_username: "потребителско име " + reject_reason: + title: "Защо отхвърляте този потребител?" + send_email: "Изпратете имейл за отхвърляне" relative_time_picker: + minutes: + one: "минута" + other: "минути" + hours: + one: "час" + other: "часа" days: one: "ден" other: "дни " + relative: "Относителна" time_shortcut: later_today: "По-късно днес" next_business_day: "Следващия работен ден" tomorrow: "Утре" + post_local_date: "Дата в публикацията" later_this_week: "По-късно тази седмица" this_weekend: "Този уикенд" + start_of_next_business_week: "Понеделник" start_of_next_business_week_alt: "Следващия понеделник" + two_weeks: "Две седмици" next_month: "Следващия месец" + six_months: "Шест месеца" custom: "Друга дата и час" + relative: "Относително време" + none: "Няма нужда" + last_custom: "Последна персонализирана дата и час" user_action: user_posted_topic: "%{user} публикува тази тема" you_posted_topic: "Вие публикувахте тази тема" @@ -480,7 +590,9 @@ bg: one: "%{count} потребител" other: "%{count} потребители" edit_columns: + title: "Редактиране на колони в директорията" save: "Запази" + reset_to_default: "Обновявам до първоначалното" group: all: "всички групи" group_histories: @@ -492,38 +604,99 @@ bg: remove_user_as_group_owner: "Премахни като собственик" groups: member_added: "Добавено" + member_requested: "Заявен на" add_members: + title: "Добавете потребители към %{group_name}" + description: "Въведете списък с потребители, които искате да поканите в групата, или поставете в списък, разделен със запетая:" usernames_placeholder: "потебителско име" + usernames_or_emails_placeholder: "потребителски имена или имейли" + notify_users: "Уведомете потребителите" + set_owner: "Задайте потребителите като собственици на тази група" requests: title: "Заявки" reason: "Причина" + accept: "Приемам" accepted: "прието" + deny: "Отказ" + denied: "отказан" + undone: "заявката е отменена" + handle: "обработва заявка за членство" manage: title: "Управление" name: "Име" full_name: "Пълно име" + add_members: "Добавяне на потребители" invite_members: "Покана" delete_member_confirm: "Премахнете '%{username}' от група '%{group}' ?" profile: title: Профил interaction: + title: Взаимодействие posting: Публикуване notification: Известие email: title: "Имейл" + status: "Синхронизирани %{old_emails} / %{total_emails} имейли чрез IMAP." + enable_smtp: "Активирайте SMTP" + enable_imap: "Активирайте IMAP" + test_settings: "Изпробвайте настройките" + save_settings: "Запазване на настройките" + last_updated: "Последна актуализация:" last_updated_by: "от" + settings_required: "Всички настройки са задължителни, моля попълнете всички полета преди потвърждаване." + smtp_settings_valid: "SMTP настройките са валидни." + smtp_title: "SMTP" + smtp_instructions: "Когато активирате SMTP за групата, всички изходящи имейли, изпратени от входящата кутия на групата, ще бъдат изпращани чрез SMTP настройките, посочени тук, вместо пощенския сървър, конфигуриран за други имейли, изпратени от вашия форум." + imap_title: "IMAP" + imap_additional_settings: "Допълнителни настройки" + imap_instructions: 'Когато активирате IMAP за групата, имейлите се синхронизират между входящата кутия на групата и предоставения IMAP сървър и пощенска кутия. SMTP трябва да бъде активиран с валидни и тествани идентификационни данни, преди да може да се активира IMAP. Имейл потребителското име и паролата, използвани за SMTP, ще се използват за IMAP. За повече информация вижте функции на Discourse Meta.' + imap_alpha_warning: "Предупреждение: Това е функция за алфа-етап. Официално се поддържа само Gmail. Използвайте на свой собствен риск!" + imap_settings_valid: "Настройките за IMAP са валидни." + smtp_disable_confirm: "Ако деактивирате SMTP, всички настройки за SMTP и IMAP ще бъдат нулирани и свързаната функционалност ще бъде деактивирана. Сигурен ли си, че искаш да продължиш?" + imap_disable_confirm: "Ако деактивирате IMAP, всички IMAP настройки ще бъдат нулирани и свързаната функционалност ще бъде деактивирана. Сигурен ли си, че искаш да продължиш?" + imap_mailbox_not_selected: "Трябва да изберете пощенска кутия за тази IMAP конфигурация или пощенските кутии няма да се синхронизират!" + prefill: + title: "Предварително попълване с настройки за:" + gmail: "Gmail" credentials: + title: "Данни за удостоверяване" + smtp_server: "SMTP сървър" + smtp_port: "SMTP порт" + smtp_ssl: "Използвайте SSL за SMTP" + imap_server: "IMAP сървър" + imap_port: "IMAP порт" + imap_ssl: "Използвайте SSL за IMAP" username: "Потребителско име" password: "Парола" settings: title: "Настройки" + allow_unknown_sender_topic_replies: "Разрешаване на отговори по темата от неизвестен подател." + allow_unknown_sender_topic_replies_hint: "Позволява на неизвестни податели да отговарят на групови теми. Ако това не е активирано, отговорите от имейл адреси, които все още не са поканени в темата, ще създадат нова тема." + mailboxes: + synchronized: "Синхронизирана пощенска кутия" + none_found: "В този имейл акаунт не бяха намерени пощенски кутии." + disabled: "Деактивирани" membership: title: Членство access: Достъп categories: title: Категории + long_title: "Известия по подразбиране за категория" + description: "Когато потребителите бъдат добавени към тази група, техните настройки за уведомяване за категории ще бъдат зададени на тези по подразбиране. След това могат да ги сменят." + watched_categories_instructions: "Автоматично гледайте всички теми в тези категории. Членовете на групата ще бъдат уведомени за всички нови публикации и теми, а до темата ще се появи и брой нови публикации." + tracked_categories_instructions: "Автоматично проследяване на всички теми в тези категории. Брой нови публикации ще се появи до темата." + watching_first_post_categories_instructions: "Потребителите ще бъдат уведомени за първата публикация във всяка нова тема в тези категории." + regular_categories_instructions: "Ако тези категории са заглушени, те ще бъдат незаглушени за членовете на групата. Потребителите ще бъдат уведомени, ако са споменати или някой им отговори." + muted_categories_instructions: "Потребителите няма да бъдат уведомявани за нищо за нови теми в тези категории и няма да се показват в категориите или страниците с най-нови теми." tags: title: Етикети + long_title: "Известия по подразбиране на таговете" + description: "Когато потребителите бъдат добавени към тази група, техните настройки за известяване на таговете ще бъдат зададени на тези по подразбиране. След това могат да ги сменят." + watched_tags_instructions: "Автоматично гледайте всички теми с тези тагове. Членовете на групата ще бъдат уведомени за всички нови публикации и теми, а до темата ще се появи и брой нови публикации." + tracked_tags_instructions: "Автоматично проследявайте всички теми с тези тагове. Брой нови публикации ще се появи до темата." + watching_first_post_tags_instructions: "Потребителите ще бъдат уведомени за първата публикация във всяка нова тема с тези тагове." + regular_tags_instructions: "Ако тези тагове са заглушени, те ще бъдат незаглушени за членовете на групата. Потребителите ще бъдат уведомени, ако са споменати или някой им отговори." + muted_tags_instructions: "Потребителите няма да бъдат уведомявани за нищо за нови теми с тези тагове и няма да се показват в категориите или страниците с най-нови теми." logs: title: "Логове" when: "Кога" @@ -536,11 +709,14 @@ bg: to: "До" permissions: title: "Позволения " + none: "Няма категории, свързани с тази група." + description: "Членовете на тази група имат достъп до тези категории" public_admission: "Разрешено е на потребителите да се присъединяват към групата свободно (Изисква се публично видима група)" public_exit: "Разрешено е на потребителите да напуската групата свободно" empty: posts: "Няма публикации от членове на тази група." members: "Няма членове в тази група." + requests: "Няма заявки за членство в тази група." mentions: "Няма споменавания на тази група." messages: "Няма съобщения за тази група." topics: "Няма теми от членове на тази група." @@ -550,6 +726,13 @@ bg: leave: "Напусни" request: "Заявка" message: "Съобщение" + confirm_leave: "Наистина ли искате да напуснете тази група?" + allow_membership_requests: "Позволете на потребителите да изпращат заявки за членство до собствениците на групи (изисква публично видима група)" + membership_request_template: "Персонализиран шаблон за показване на потребителите при изпращане на заявка за членство" + membership_request: + submit: "Изпрати заявка" + title: "Заявка за присъединяване @%{group_name}" + reason: "Уведомете собствениците на групата защо принадлежите към тази група" membership: "Членство" name: "Име" group_name: "Име на групата" @@ -585,9 +768,27 @@ bg: remove_member: "Премахни Потребител" remove_member_description: "Премахни %{username} от тази група" make_owner: "Направи Собственик" + make_owner_description: "Направете %{username} собственик на тази група" remove_owner: "Премахни като Собственик" remove_owner_description: "Премахни %{username} като собственик на тази група" + make_primary: "Направи основенa" + make_primary_description: "Направете това основна група за %{username}" + remove_primary: "Премахване като основнa" + remove_primary_description: "Премахнете това като основна група за %{username}" + remove_members: "Премахване на членове" + remove_members_description: "Премахнете избраните потребители от тази група" + make_owners: "Направете собственици" + make_owners_description: "Направете избрани потребители собственици на тази група" + remove_owners: "Премахване на собственици" + remove_owners_description: "Премахнете избраните потребители като собственици на тази група" + make_all_primary: "Направете всички Основни" + make_all_primary_description: "Направете това основна група за всички избрани потребители" + remove_all_primary: "Премахване като Основна" + remove_all_primary_description: "Премахнете тази група като основна" owner: "Собественик" + primary: "Основен" + forbidden: "Нямате право да преглеждате потребителите." + no_filter_matches: "Няма потребители, отговарящи на това търсене." topics: "Теми" posts: "Публикации" mentions: "Споменавания" @@ -600,6 +801,7 @@ bg: only_admins: "Само администратори" mods_and_admins: "Само модератори и администратори" members_mods_and_admins: "Само членове, модератори и администратори" + owners_mods_and_admins: "Само собственици на групи, модератори и администратори" everyone: "Всички" notifications: watching: @@ -607,6 +809,7 @@ bg: description: "Вие бъдете уведомени за всеки нов пост във всяко съобщение, както и за броя на новите съобщения." watching_first_post: title: "Следейки за първа публикация" + description: "Ще бъдете уведомени за нови съобщения в тази група, но не и за отговори на съобщенията." tracking: title: "Проследяване" description: "Ще бъдете уведомени, ако някой ви спомене чрез @name или ви отговори, както и на броя на новите ви съобщения ще бъдат показани." @@ -615,15 +818,23 @@ bg: description: "Ще бъдете уведомени, ако някой ви споменава чрез @name или ви отговори." muted: title: "Заглушен" + description: "Няма да бъдете уведомявани за нищо за съобщения в тази група." flair_url: "Добавка към аватара" + flair_upload_description: "Използвайте квадратни изображения не по-малки от 20px на 20px." flair_bg_color: "Фон на добавка към аватара" flair_bg_color_placeholder: "(По желание) Шестнадесетична стойност на цвят" flair_color: "Цвят на добавка към аватар" flair_color_placeholder: "(По желание) Шестнадесетична стойност на цвят" flair_preview_icon: "Икона за прегледа" flair_preview_image: "Снимка за преглед" + flair_type: + icon: "Изберете икона" + image: "Качете изображение" default_notifications: + modal_title: "Потребителски известия по подразбиране" + modal_description: "Искате ли да приложите тази промяна исторически? Това ще промени предпочитанията за %{count} съществуващи потребители." modal_yes: "Да" + modal_no: "Не, промяната се прилага само занапред" user_action_groups: "1": "Дадени харесвания" "2": "Получени харесвания" @@ -637,7 +848,7 @@ bg: "12": "Изпратени" "13": "Кутия" "14": "Чакащи" - "15": "Drafts" + "15": "Чернови" categories: all: "всички категории" all_subcategories: "всички подкатегории" @@ -654,12 +865,19 @@ bg: topics: "Теми" latest: "Последни" subcategories: "Подкатегории" + muted: "Заглушени категории" topic_sentence: one: "%{count} тема" other: "%{count} теми" + topic_stat: + one: "%{number} / %{unit}" + other: "%{number} / %{unit}" topic_stat_unit: week: "седмица" month: "месец" + topic_stat_all_time: + one: "%{number} общо" + other: "%{number} общо" topic_stat_sentence_week: one: "%{count}нова тема през последната седмица." other: "%{count}нови теми през последната седмица." @@ -702,31 +920,57 @@ bg: private_messages: "Съобщения" user_notifications: filters: + filter_by: "Филтриране по" all: "Всички" read: "Прочетени" unread: "Непрочетени" + unseen: "Непрегледани" + ignore_duration_title: "Игнориране на потребителя" ignore_duration_username: "Потребителско име" ignore_duration_when: "Продължителност:" + ignore_duration_save: "Игнорирай" + ignore_duration_note: "Моля, имайте предвид, че всички игнорирания се премахват автоматично след изтичане на продължителността на игнорирането." + ignore_duration_time_frame_required: "Моля, изберете времева рамка" ignore_no_users: "Нямате игнорирани потребители." + ignore_option: "Игнориран" + ignore_option_title: "Няма да получавате известия, свързани с този потребител и всички негови теми и отговори ще бъдат скрити." add_ignored_user: "Добавете ..." mute_option: "Заглушен" + mute_option_title: "Няма да получавате никакви известия, свързани с този потребител." normal_option: "Нормален" + normal_option_title: "Ще бъдете уведомени, ако този потребител ви отговори, цитира ви или ви спомене." notification_schedule: + title: "График за уведомяване" + label: "Активирайте персонализиран график за известия" + tip: "Извън тези часове автоматично ще бъдете въведени в режим „Не безпокойте“." + midnight: "Полунощ" none: "Без" + monday: "Понеделник" + tuesday: "Вторник" + wednesday: "Сряда" + thursday: "Четвъртък" + friday: "Петък" + saturday: "Събота" + sunday: "Неделя" to: "до" activity_stream: "Активност" read: "Прочетени" + read_help: "Наскоро прочетени теми" preferences: "Настройки" feature_topic_on_profile: open_search: "Изберете нова тема" title: "Изберете тема" + search_label: "Търсене на тема по заглавие" save: "Запази" clear: title: "Изчисти" + warning: "Наистина ли искате да изчистите представената си тема?" use_current_timezone: "Използвайте текущата часова зона" profile_hidden: "Публичният профил на този потребител е скрит." expand_profile: "Разшири" + sr_expand_profile: "Разгънете подробностите за профила" collapse_profile: "Намали" + sr_collapse_profile: "Свиване на подробностите за профила" bookmarks: "Отметки" bio: "За мен" timezone: "Часова зона" @@ -742,32 +986,72 @@ bg: perm_denied_expl: "Вие сте забранили известията. Моля разрешете ги чрез настройките на браузъра си." disable: "Деактивиране на Известията" enable: "Активиране на Известията" + each_browser_note: 'Забележка: Трябва да промените тази настройка на всеки браузър, който използвате. Всички известия ще бъдат деактивирани, когато сте в „не безпокойте“, независимо от тази настройка.' consent_prompt: "Искате ли известявания в реално време, когато хората отговарят на вашите публикации?" dismiss: "Отмени" dismiss_notifications: "Отмени всички" dismiss_notifications_tooltip: "Маркирайте всички непрочетени известия, като прочетени" + no_messages_title: "Нямате никакви съобщения" + no_messages_body: > + Имате нужда от директен личен разговор с някого, извън нормалния разговорен поток? Изпратете им съобщение, като изберете техния аватар и използвате бутона %{icon} съобщение.

Ако имате нужда от помощ, можете да изпратите съобщение до член на персонала. + no_bookmarks_title: "Все още не сте отбелязали нищо" + no_bookmarks_body: > + Започнете да маркирате публикации с бутона %{icon} и те ще бъдат изброени тук за лесна справка. Можете също да насрочите напомняне! + no_bookmarks_search: "Няма намерени отметки с предоставената заявка за търсене." + no_notifications_title: "Все още нямате известия" + no_notifications_body: > + Ще бъдете уведомени в този панел за дейност, пряко свързана с вас, включително отговори на вашите теми и публикации, когато някой @спомена ви спомене или ви цитира, и отговори на теми, които гледате. Известия също ще бъдат изпращани на вашия имейл, когато не сте влизали известно време.

Потърсете %{icon} да решите за кои конкретни теми, категории и тагове искате да получавате известия. За повече информация вижте вашите предпочитания за уведомяване. + no_notifications_page_title: "Все още нямате известия" + no_notifications_page_body: > + Ще бъдете уведомени за дейност, пряко свързана с вас, включително отговори на вашите теми и публикации, когато някой @спомене или ви цитира, и отговори на теми, които гледате. Известия също ще бъдат изпращани на вашия имейл, когато не сте влизали известно време.

Потърсете %{icon} да решите за кои конкретни теми, категории и тагове искате да получавате известия. За повече информация вижте вашите предпочитания за уведомяване. first_notification: "Вашето първо известие! Изберете го за да започнете." + dynamic_favicon: "Показване на броя на иконата на браузъра" + skip_new_user_tips: + description: "Пропуснете съвети и значки за въвеждане на нови потребители" + not_first_time: "Не ти ли е за първи път?" + skip_link: "Пропуснете тези съвети" + read_later: "Ще го прочета по-късно." theme_default_on_all_devices: "Направи тази тема стандарт на всичките ми устройства" + color_scheme_default_on_all_devices: "Задаване на цветова схема(и) по подразбиране на всички мои устройства" + color_scheme: "Цветова схема" color_schemes: + default_description: "Темата по подразбиране" + disable_dark_scheme: "Същото като обикновения" + dark_instructions: "Можете да прегледате цветовата схема на тъмния режим, като превключите тъмния режим на вашето устройство." + undo: "Нулиране" regular: "Редовен" + dark: "Тъмен режим" + default_dark_scheme: "(сайт по подразбиране)" + dark_mode: "Тъмен режим" + dark_mode_enable: "Активирайте цветовата схема за автоматичен тъмен режим" + text_size_default_on_all_devices: "Направете това размерът на текста по подразбиране на всички мои устройства" + allow_private_messages: "Позволете на други потребители да ми изпращат лични съобщения" external_links_in_new_tab: "Отваряй всички външни връзки в нов раздел." enable_quoting: "Включи отговор с цитат при маркиран текст." + enable_defer: "Активирайте отлагане, за да маркирате темите като непрочетени" change: "промени" + featured_topic: "Представена тема" moderator: "%{user} е модератор" admin: "%{user} е админ" moderator_tooltip: "Този потребител е модератор" admin_tooltip: "Този потребител е админ" + silenced_tooltip: "Този потребител е заглушен" suspended_notice: "Този потребител е отстранен до %{date}." + suspended_permanently: "Този потребител е спрян." suspended_reason: "Причина:" github_profile: "GitHub" email_activity_summary: "Сумарна активност" mailing_list_mode: label: "Режим Бюлетин" enabled: "Включи режим Бюлетин" + instructions: | + Тази настройка отменя обобщението на дейността.
+ Заглушените теми и категории не са включени в тези имейли. individual: "Изпращане на email за всяка нова публикация" individual_no_echo: "Пращай имейл за всяка нова публикация освен моите собствени" many_per_day: "Пращай имейл за всяка нова публикация (около %{dailyEmailEstimate} на ден)" few_per_day: "Изпратете ми имейл за всяка нова публикация (около 2 на ден)" + warning: "Режимът на пощенския списък е активиран. Настройките за уведомяване по имейл са отменени." tag_settings: "Етикети" watched_tags: "Наблюдавани" watched_tags_instructions: "Вие автоматично ще наблюдавате всички теми с този етикет. Ще бъдете информиран за всички нови публикации и теми, и броят на непрочетените и новите публикации ще се появява до съответната тема. " @@ -784,7 +1068,10 @@ bg: watched_first_post_tags: "Наблюдавайки Първа Публикация" watched_first_post_tags_instructions: "Ще бъдете уведомени за първата публикация във всяка нова тема с тези етикети." muted_categories: "Заглушен" + muted_categories_instructions: "Няма да получавате известия за нови теми в тези категории и те няма да се показват в категориите или най-новите страници." + muted_categories_instructions_dont_hide: "Няма да получавате известия за нови теми в тези категории." regular_categories: "Редовен" + regular_categories_instructions: "Ще видите тези категории в списъците с теми „Последни“ и „Топ“." no_category_access: "Като модератор имате ограничен достъп до категориите, запазването е изключено." delete_account: "Изтрий моя профил" delete_account_confirm: "Сигурни ли сте, че искате да изтриете вашия акаунт? Акаунтът не може да бъде възстановен !" @@ -794,12 +1081,22 @@ bg: admin_delete: "Изтрий" users: "Потребители" muted_users: "Заглушен" + muted_users_instructions: "Спрете всички известия и PM от тези потребители." + allowed_pm_users: "Позволено" + allowed_pm_users_instructions: "Разрешете PM само от тези потребители." + allow_private_messages_from_specific_users: "Разрешавайте само на определени потребители да ми изпращат лични съобщения" + ignored_users: "Игнориран" + ignored_users_instructions: "Спрете всички публикации, известия и PM от тези потребители." tracked_topics_link: "Покажи " automatically_unpin_topics: "Автоматично отключете темите когато стигнете най-долу на форума." apps: "Приложения" revoke_access: "Прекратяване на достъпа" undo_revoke_access: "Отмяна прекратяване на достъпа" api_approved: "Одобрени:" + api_last_used_at: "Последно използван на:" + theme: "Тема" + save_to_change_theme: 'Темата ще бъде актуализирана, след като кликнете върху "%{save_text}“' + home: "Начална страница по подразбиране" staged: "Поставен" staff_counters: flags_given: "полезни сигнали" @@ -807,8 +1104,11 @@ bg: deleted_posts: "изтрити публикации" suspensions: "отстранявания" warnings_received: "предупреждения" + rejected_posts: "отхвърлени публикации" messages: + all: "всички пощенски кутии" inbox: "Входяща кутия" + personal: "Лични" latest: "Последни" sent: "Изпратени" unread: "Непрочетени" @@ -825,6 +1125,11 @@ bg: move_to_archive: "Архив" failed_to_move: "Грешка при преместването на съобщенията (може би интернета ви спря?)" tags: "Етикети" + warnings: "Официални предупреждения" + read_more_in_group: "Искате ли да прочетете повече? Разгледайте други съобщения в %{groupLink}." + read_more: "Искате ли да прочетете повече? Разгледайте други съобщения в лични съобщения." + read_more_group_pm_MF: "Има{ UNREAD, plural, =0 {} one { е # непрочетено } other { са # непрочетени } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false {е } other{}} # ново съобщение} other { {BOTH, select, true{и } false {са } other{}} # нови съобщения} } оставащи, или прегледайте други съобщения в {groupLink}" + read_more_personal_pm_MF: "Има { UNREAD, plural, =0 {} one { е # непрочетено } other { са # непрочетени } } { NEW, plural, =0 {} one { {BOTH, select, true{и } false {е } other{}} # ново съобщение} other { {BOTH, select, true{и } false {са } other{}} # нови съобщения} } оставащи, или прегледайте други лични съобщения" preferences_nav: account: "Профил" security: "Сигурност" @@ -834,74 +1139,164 @@ bg: categories: "Категории" users: "Потребители" tags: "Етикети" + interface: "Интерфейс" apps: "Апликации" change_password: success: "(имейлът е изпратен)" in_progress: "(изпраща се имейл)" error: "(грешка)" + emoji: "заключване на емоджи" action: "Изпратете имейл за смяна на паролата" set_password: "Задайте парола" choose_new: "Избери нова парола" choose: "Избери парола" second_factor_backup: + title: "Двуфакторни резервни кодове" regenerate: "Регенерирай" disable: "Деактивиране" enable: "Позволи" + enable_long: "Активиране на резервни кодове" + manage: + one: "Управление на резервни кодове. Остава ви %{count} резервен код." + other: "Управление на резервни кодове. Остават ви %{count} резервни кода." + copy_to_clipboard: "Копиране в клипборда" + copy_to_clipboard_error: "Грешка при копирането на данни в клипборда" + copied_to_clipboard: "Копирано в клипборда" + download_backup_codes: "Изтеглете резервни кодове" + remaining_codes: + one: "Остава ви %{count} резервен код." + other: "Остават ви %{count} резервни кода." + use: "Използвайте резервен код" + enable_prerequisites: "Трябва да активирате основен двуфакторен метод, преди да генерирате резервни кодове." + codes: + title: "Резервните кодове са генерирани" + description: "Всеки от тези резервни кодове може да се използва само веднъж. Дръжте ги на безопасно, но достъпно място." second_factor: + title: "Двуфакторна автентификация" + enable: "Управление на двуфакторна автентификация" + disable_all: "Деактивиране на всички" + forgot_password: "Забравена парола?" confirm_password_description: "Моля, потвърдете паролата за да продължите" name: "Име" label: "Код" + rate_limit: "Моля, изчакайте, преди да опитате друг код за удостоверяване." + enable_description: | + Сканирайте този QR код в поддържано приложение (Android – iOS) и въведете своя код за удостоверяване. + disable_description: "Моля, въведете кода за удостоверяване от вашето приложение" + show_key_description: "Въведете ръчно" + short_description: | + Защитете акаунта си с кодове за сигурност за еднократна употреба. + extended_description: | + Двуфакторното удостоверяване добавя допълнителна сигурност към вашия акаунт, като изисква еднократен токен в допълнение към вашата парола. Токените могат да се генерират на устройства с Android и iOS. + oauth_enabled_warning: "Моля, имайте предвид, че влизане чрез социална мрежа, ще бъдат деактивирани, след като двуфакторното удостоверяване е активирано във вашия акаунт." use: "Използвайте приложението за удостоверяване" + enforced_notice: "От вас се изисква да активирате двуфакторна автентификация, преди да влезете в този сайт." disable: "Деактивиране" + disable_confirm: "Наистина ли искате да деактивирате всички двуфакторни методи?" save: "Запази" edit: "Редактирай" + edit_title: "Редактиране на Authenticator" + edit_description: "Име на Authenticator" + enable_security_key_description: | + Когато сте хардуерен ключ за сигурност , натиснете бутона Регистриране по-долу. + totp: + title: "Authenticator, базиран на токени" + add: "Добавете Authenticator" + default_name: "Моят Authenticator" + name_and_code_required_error: "Трябва да предоставите име и кода от вашето приложение за удостоверяване." security_key: register: "Регистриране" + title: "Ключове за сигурност" + add: "Добавете ключ за сигурност" + default_name: "Основен ключ за сигурност" + not_allowed_error: "Процесът на регистрация на ключ за сигурност или е изтекъл, или е бил анулиран." + already_added_error: "Вече сте регистрирали този ключ за сигурност. Не е нужно да го регистрирате отново." + edit: "Редактиране на ключа за сигурност" save: "Запази" + edit_description: "Име на ключа за сигурност" + name_required_error: "Трябва да посочите име за вашия ключ за сигурност." change_about: title: "Смяна на За мен" error: "Имаше грешка при промяна на тази стойност." change_username: title: "Смяна на потребителското име." + confirm: "Сигурни ли сте, че искате да промените потребителското си име?" taken: "Съжаляваме, това потребителско име е заето." invalid: "Потребителското име не е валидно. Трябва да включва само цифри и букви" add_email: + title: "Добавете имейл" add: "добавяне" change_email: title: "Смяна на Имейла" taken: "Съжаляваме, този имейл адрес не е свободен." error: "Получи се грешка при смяната на адреса. Вероятно адресът вече е зает?" success: "Изпратихме съобщение на този адрес. Моля, следвайте инструкциите за потвърждаване." + success_via_admin: "Изпратихме имейл на този адрес. Потребителят ще трябва да следва инструкциите за потвърждение в имейла." success_staff: "Изпратихме съобщение на този адрес. Моля, следвайте инструкциите за потвърждаване." change_avatar: title: "Сменете аватара на вашия профил " + gravatar: "%{gravatarName}, въз основа на" + gravatar_title: "Променете своя аватар на уебсайта %{gravatarName}" + gravatar_failed: "Не можахме да намерим %{gravatarName} с този имейл адрес." + refresh_gravatar_title: "Обновете своя %{gravatarName}" letter_based: "Системен аватар" uploaded_avatar: "Собствено изображение" uploaded_avatar_empty: "Добавете собствено изображение" upload_title: "Качете изображение" image_is_not_a_square: "Внимание: изрязахмеИзрязахме вашата снимка,снимка защото не е с квадратна форма." + logo_small: "Малко лого на сайта. Използва се по подразбиране." + change_profile_background: + title: "Заглавен ред на профила" + instructions: "Заглавните редове на профилите ще бъдат центрирани и имат ширина по подразбиране от 1110px." change_card_background: title: "Потребителски фон" instructions: "Фонът ще бъде центриран и ще има дължина 590 пиксела." + change_featured_topic: + title: "Представена тема" + instructions: "Връзка към тази тема ще бъде във вашата потребителска карта и профил." email: title: "Имейл" + primary: "Основен имейл" + secondary: "Вторични имейли" primary_label: "главен" + unconfirmed_label: "непотвърдено" + resend_label: "изпрати отново и-мейл за потвърждение" + resending_label: "изпращане..." + resent_label: "имейлът е изпратен" update_email: "Смяна на Имейла" + set_primary: "Задайте основен имейл" + destroy: "Премахване на имейл" + add_email: "Добавете алтернативен имейл" + auth_override_instructions: "Имейлът може да бъде актуализиран от доставчика на удостоверяване." + no_secondary: "Няма вторични имейли" instructions: "Не е публичен" + admin_note: "Забележка: Администратор, който променя имейла на друг потребител, който не е администратор, показва, че потребителят е загубил достъп до първоначалния си имейл акаунт, така че имейл за нулиране на паролата ще бъде изпратен на новия му адрес. Имейлът на потребителя няма да се промени, докато не завърши процеса на нулиране на паролата." ok: "Ще Ви изпратим имейл за потвърждение." + required: "Моля, въведете имейл адрес" invalid: "Моля, въведете валиден имейл адрес" authenticated: "Вашият имейл беше потвърден от %{provider}." + invite_auth_email_invalid: "Вашият имейл с покана не съвпада с имейла, удостоверен с %{provider}" + authenticated_by_invite: "Вашият имейл е удостоверен от поканата" frequency_immediately: "Ще ви изпратим мейл веднага, ако не сте прочели поста за който сме ви писали." frequency: one: "Ние ще ви изпратим имейл само ако не сме ви виждали през последната минута." other: "Ние ще ви изпратим имейл само ако не сме ви виждали през последните %{count} минути." associated_accounts: + title: "Свързани акаунти" + connect: "Свържете се" revoke: "Анулирай" cancel: "Отмени" + not_connected: "(няма връзка)" + confirm_modal_title: "Свържете %{provider} акаунт" + confirm_description: + disconnect: "Вашият съществуващ %{provider} акаунт „%{account_description}“ ще бъде прекъснат." + account_specific: "Вашият %{provider} акаунт '%{account_description}' ще се използва за удостоверяване." + generic: "Вашият %{provider} акаунт ще се използва за удостоверяване." name: title: "Име" instructions: "вашето пълно име (опционално)" instructions_required: "Вашето пълно име" + required: "Моля, въведете име" too_short: "Името е твърде кратко." ok: "Вашето име изглежда добре" username: @@ -915,14 +1310,33 @@ bg: too_long: "Потребителското име е твърде дълго" checking: "Проверяваме дали потребителското име е свободно..." prefilled: "Имейлът съвпада с това потребителско име" + required: "Моля, въведете потребителско име" + edit: "Редактиране на потребителско име" locale: title: "Език на интерфейса" instructions: "Езикът на потребителския интерфейс, ще бъде променен, след като презаредите страницата." default: "(по подразбиране)" + any: "всеки" password_confirmation: title: "Паролата отново" + invite_code: + title: "Код за покана" + instructions: "Регистрацията на акаунт изисква код за покана" auth_tokens: + title: "Наскоро използвани устройства" details: "Детайли " + log_out_all: "Излезте от всички" + not_you: "Не си ти?" + show_all: "Покажи всички (%{count})" + show_few: "Покажете по-малко" + was_this_you: "Това ти ли беше?" + was_this_you_description: "Ако не сте били вие, препоръчваме ви да промените паролата си и да излезете навсякъде." + browser_and_device: "%{browser} на %{device}" + secure_account: "Защитете акаунта си" + latest_post: "Последно публикувахте…" + device_location: '%{device} – %{location}' + browser_active: '%{browser} | активен сега' + browser_last_seen: "%{browser} | %{date}" last_posted: "Последна публикация" last_seen: "Видян" created: "Присъединен" @@ -930,8 +1344,19 @@ bg: location: "Локация" website: "Уеб сайт" email_settings: "Имейл " + hide_profile_and_presence: "Скриване на моя публичен профил и функции за присъствие" + enable_physical_keyboard: "Активирайте поддръжката на физическа клавиатура на iPad" text_size: + title: "Размер на текста" + smallest: "Най-малката" + smaller: "По-малък" normal: "Нормален" + larger: "По-голям" + largest: "Най-големият" + title_count_mode: + title: "Заглавието на фоновата страница показва броя на:" + notifications: "Нови известия" + contextual: "Ново съдържание на страницата" like_notification_frequency: title: "Информирай ме когато е харесан" always: "Винаги" @@ -944,6 +1369,7 @@ bg: always: "винаги" never: "никога" email_digests: + title: "Когато не посещавам тук, изпратете ми имейл с резюме на популярни теми и отговори" every_30_minutes: "на всеки 30 минути" every_hour: "почасово" daily: "дневно" @@ -953,6 +1379,7 @@ bg: email_level: title: "Изпращайте ми имейл, когато някой ме цитира, отговаря на моите публикации, цитира моето @потребителско_име или ме кани да се присъединя към тема." always: "винаги" + only_when_away: "само когато не съм на линия" never: "никога" email_messages_level: "Изпращай ми имейл, когато някой ми изпрати съобщение" include_tl0_in_digests: "Включи мненията от нови потребители в обобщените имейли" @@ -978,20 +1405,30 @@ bg: after_4_minutes: "след 4 минути" after_5_minutes: "след 5 минути" after_10_minutes: "след 10 минути" + notification_level_when_replying: "Когато публикувам в тема, задайте тази тема на" invited: title: "Покани" pending_tab: "Чакащи" pending_tab_with_count: "Чакащи (%{count})" + expired_tab: "Изтекъл срок" + expired_tab_with_count: "Изтекъл срок (%{count})" redeemed_tab: "Взети" redeemed_tab_with_count: "Взети (%{count})" invited_via: "Покана" + invited_via_link: "връзка %{key} (%{count} / %{max} осребрени)" groups: "Групи" topic: "Тема" + sent: "Създаден/последно изпратен" + expires_at: "Изтича" edit: "Редактирай" remove: "Премахване" + copy_link: "Вземете връзка" + reinvite: "Изпратете отново имейла" reinvited: "Поканата е изпратена отново" + removed: "Премахнато" search: "търсете покани" user: "Поканени потребители" + none: "Няма покани за показване." truncated: one: "Показване на първата покана." other: "Показване на пъврите %{count} покани." @@ -1001,10 +1438,18 @@ bg: topics_entered: "Прегледани теми" posts_read_count: "Прочетени публикации" expired: "Тази покана е изтекла." + remove_all: "Премахване на изтекли покани" + removed_all: "Всички изтекли покани са премахнати!" + remove_all_confirm: "Наистина ли искате да премахнете всички изтекли покани?" + reinvite_all: "Изпратете отново всички покани" + reinvite_all_confirm: "Наистина ли искате да изпратите отново всички покани?" + reinvited_all: "Всички покани са изпратени!" time_read: "Време за прочитане" days_visited: "Дни Посетена" account_age_days: "Период на акаунта в дни" create: "Покана" + generate_link: "Създаване на връзка за покана" + link_generated: "Ето вашата връзка за покана!" password: title: "Парола" too_short: "Вашата парола е твърде кратка." @@ -1108,11 +1553,16 @@ bg: enabled: "Сайта е в режим само за четене. Моля продължете да разглеждате, но отгавяне, харесване и всичко останали опции са спряни за сега." login_disabled: "Влизането е изключено, докато страницата е в режим само за четене." logout_disabled: "Излизане от сайта е временно спряно, докато е пуснат режим \"само за четене\"." + logs_error_rate_notice: + reached_minute_MF: "{relativeAge} – {rate, plural, one {# грешка/минута} other {# грешки/минута}} достигна ограничението за настройка на сайта от {limit, plural, one {# грешка/минута} other {# грешки/минута}}." + exceeded_hour_MF: "{relativeAge} – {rate, plural, one {# грешка/час} other {# грешки/час}} превиши лимита за настройка на сайта от {limit, plural, one {# грешка/час} other {# грешки/час}}." + exceeded_minute_MF: "{relativeAge} – {rate, plural, one {# грешка/минута} other {# грешки/минута}} превиши лимита за настройка на сайта от {limit, plural, one {# грешка/минута} other {# грешки/минута}}." learn_more: "научете повече..." first_post: Първа публикация mute: Заглушаване unmute: Премахване на заглушаване last_post: Публикувано + local_time: "Местно време" time_read: Прочетени time_read_recently: "%{time_read} наскоро" time_read_tooltip: "Прочетено общо %{time_read} пъти" @@ -1125,12 +1575,16 @@ bg: sign_up: "Регистрирай се" hide_session: "Напомни ми утре" hide_forever: "не благодаря" + hidden_for_session: "Добре, ще те попитаме утре. Винаги можете да използвате „Вход“ и за създаване на акаунт." intro: "Здравейте! Изглежда, че следите дискусията, но все още не сте създали собствен профил." value_prop: "Когато създадете профил, ще отбелязваме това, което сте чели, така че да можете да продължите от там, откъдето сте спрели. Можете също така да получавате известия тук и по електронната поща, когато има нови мнения. Също така ще може да маркирате любимите си публикации." summary: enabled_description: "В момента гледате резюме на тази тема: най-интересните публикации определени от общността." + description_time_MF: "Има{replyCount, plural, one {# reply} other { # отговора}} с очаквано време за четене {readingTime, plural, one {# минута} other {# минути}}." enable: "Обобщи Тази Тема" disable: "Покажи всички публикации" + short_label: "Обобщаване" + short_title: "Покажете обобщение на тази тема: най-интересните публикации, определени от общността" deleted_filter: enabled_description: "Тази тема има изтрити публикации, които са скрити." disabled_description: "Изтритите публикации в тази тема са показани." @@ -1139,6 +1593,8 @@ bg: private_message_info: title: "Съобщение" invite: "Поканете други..." + edit: "Добавяне или премахване..." + remove: "Премахване..." add: "Добавете ..." leave_message: "Сигурни ли сте, че искате да оставите това съобщение?" remove_allowed_user: "Сигурни ли сте, че искате да премахнете %{name} от това съобщение?" @@ -1151,8 +1607,12 @@ bg: trust_level: "Ниво на доверие" search_hint: "потребителско име, имейл или IP адрес" create_account: + header_title: "Добре дошли!" + subheader_title: "Нека създадем вашия акаунт" disclaimer: "С регистрацията си се съгласявате с политиката за повелителност и условията за ползване." + title: "Създайте своя акаунт" failed: "Нещо се случи, вероятно вече има регистрация с този имейл адрес, опитайте с линка за забравена парола." + associate: "Вече имате акаунт? Влезте да свържете вашите %{provider} акаунти." forgot_password: title: "Възстановяване на парола" action: "Забравих си паролата" @@ -1160,10 +1620,18 @@ bg: reset: "Смяна на паролата" complete_username: "Ако профилът съвпада с потребителското име %{username}, трябва да получите имейл с инструкции, как да си смените паролата. " complete_email: "Ако профилът съвпада с %{email}, трябва да получите имейл с инструкции, как да си смените паролата. " + complete_username_found: "Намерихме акаунт, който съответства на потребителското име %{username}. Скоро трябва да получите имейл с инструкции как да възстановите паролата си." + complete_email_found: "Намерихме акаунт, който съответства на %{email}. Скоро трябва да получите имейл с инструкции как да възстановите паролата си." complete_username_not_found: "Няма профил, който да съвпада с потребителскотo име %{username}" complete_email_not_found: "Няма акаунт който да съвпада с %{email}" + help: "Имейлът не пристига? Не забравяйте първо да проверите папката за спам.

Не сте сигурни кой имейл адрес сте използвали? Въведете имейл адрес и ние ще ви уведомим дали съществува тук.

Ако вече нямате достъп до имейл адреса на вашия акаунт, моля, свържете се с нашия услужлив персонал.

" button_ok: "Ок" + button_help: "Помощ" email_login: + link_label: "Изпратете ми имейл връзка за вход" + button_label: "с имейл" + login_link: "Пропуснете паролата; изпратете ми имейл връзка за вход" + emoji: "заключване на емоджи" complete_username: "Ако името %{username} съответства на регистриран профил, след малко трябва да получите имейл с линк за логин." complete_email: "Ако адресът %{email}съответства на регистриран профил, след малко трябва да получите имейл с линк за логин." complete_username_found: "Намерихме профил, който съвпада с %{username} , трябва да получите имейл с линк за логин." @@ -1171,9 +1639,27 @@ bg: complete_username_not_found: "Няма профил, който да съвпада с потребителскоto име %{username}" complete_email_not_found: "Няма акаунт който да съвпада с %{email}" confirm_title: Продължете към %{site_name} + logging_in_as: Влизане като %{email} + confirm_button: Завършете влизането login: + header_title: "Добре дошли отново" + subheader_title: "Влезте в акаунта си" + title: "Вход" username: "Потребител" password: "Парола" + second_factor_title: "Двуфакторна автентификация" + second_factor_description: "Моля, въведете кода за удостоверяване от вашето приложение:" + second_factor_backup: "Влезте с помощта на резервен код" + second_factor_backup_title: "Двуфакторно резервно копие" + second_factor_backup_description: "Моля, въведете един от вашите резервни кодове:" + second_factor: "Влезте с помощта на приложението Authenticator" + security_key_description: "Когато сте подготвили вашия физически ключ за сигурност, натиснете бутона Удостоверяване с ключ за сигурност по-долу." + security_key_alternative: "Опитайте друг начин" + security_key_authenticate: "Удостоверяване с ключ за сигурност" + security_key_not_allowed_error: "Процесът на удостоверяване на ключа за сигурност или изтече, или беше анулиран." + security_key_no_matching_credential_error: "В предоставения ключ за сигурност не бяха намерени съответстващи идентификационни данни." + security_key_support_missing_error: "Вашето текущо устройство или браузър не поддържа използването на ключове за сигурност. Моля, използвайте различен метод." + email_placeholder: "Имейл/Потребителско име" caps_lock_warning: "Включен е Caps Lock" error: "Непозната грешка" cookies_error: "Браузърът ви не приема бисквитки. Влизането Ви може да е възпрепятствано, докато не активирате бисквитките." @@ -1188,38 +1674,58 @@ bg: awaiting_approval: "Вашия акаунт все още не е одобрен от администратора. Ще получите известие, когато това се случи." requires_invite: "Съжаляваме, този форум е достъпен само с покани." not_activated: "Не може да влезете. Изпратихме имейл за активация на %{sentTo}. Моля, следвайте инструкциите в имейла, за да активирате профила." + not_allowed_from_ip_address: "Не можете да влезете от този IP адрес." admin_not_allowed_from_ip_address: "Не може да влезете като админ от този IP адрес." resend_activation_email: "Натиснете тук, за да изпратите повторен имейл за активация." + omniauth_disallow_totp: "Вашият акаунт има активирана двуфакторна автентификация. Моля, влезте с вашата парола." resend_title: "Изпрати отново активационен имейл " + change_email: "Смени имейл адреса" + provide_new_email: "Посочете нов адрес и ние ще изпратим отново имейла ви за потвърждение." + submit_new_email: "Актуализирайте имейл адреса" sent_activation_email_again: "Изпратихме имейл за активация на %{currentEmail}. Може да изминат няколко минути докато пристигне. Не забравяйте да проверите Вашата спам папка." + sent_activation_email_again_generic: "Изпратихме друг имейл за активиране. Може да отнеме няколко минути, докато пристигне; не забравяйте да проверите папката си за спам." to_continue: "Моля влезте" preferences: "Трябва да сте влезли, за да можете да променяте потребителските си настройки." not_approved: "Вашият профил все още не е одобрен. Ще бъдете уведомени с имейл, когато е възможно влизането Ви. " google_oauth2: name: "Google" title: "с Google" + sr_title: "Влезте с Google" twitter: name: "Twitter" title: "с Twitter" + sr_title: "Влезте с Twitter" instagram: name: "Instagram" title: "чрез Instagram" + sr_title: "Влезте с Instagram" facebook: name: "Facebook" title: "със Facebook" + sr_title: "Влезте с Facebook" github: name: "GitHub" title: " с Github" + sr_title: "Влезте с GitHub" discord: name: "Discord" + title: "с Discord" + sr_title: "Влезте с Discord" + second_factor_toggle: + totp: "Вместо това използвайте приложение за удостоверяване" + backup_code: "Вместо това използвайте резервен код" invites: accept_title: "Покана" + emoji: "емоджи за плик" welcome_to: "Добре дошли в %{site_name}!" invited_by: "Бяхте поканени от:" + social_login_available: "Също така ще можете да влезете с всяка социална мрежа, като използвате този имейл." + your_email: "Имейл адресът на вашия акаунт е %{email}." accept_invite: "Приеми поканата." success: "Профилът ви е създаден и вече сте влезли в него." name_label: "Име" password_label: "Парола" + optional_description: "(по избор)" password_reset: continue: "Продължете към %{site_name}" emoji_set: @@ -1227,22 +1733,83 @@ bg: google: "Google" twitter: "Twitter" win10: "Win10" + google_classic: "Google Classic" + facebook_messenger: "Facebook Messenger" + category_page_style: + categories_only: "Само категории" + categories_with_featured_topics: "Категории с избрани теми" + categories_and_latest_topics: "Категории и най-новите теми" + categories_and_top_topics: "Категории и топ теми" + categories_boxes: "Кутии с подкатегории" + categories_boxes_with_topics: "Кутии с избрани теми" shortcut_modifier_key: shift: "Shift" ctrl: "Ctrl" alt: "Alt" + enter: "Въведете" conditional_loading_section: loading: Зарежда се... + category_row: + topic_count: + one: "%{count} тема в тази категория" + other: "%{count} теми в тази категория" + plus_subcategories_title: + one: "%{name} и една подкатегория" + other: "%{name} и %{count} подкатегории" + plus_subcategories: + one: "+ %{count} подкатегория" + other: "+ %{count} подкатегории" select_kit: delete_item: "Изтрий %{name}" + filter_by: "Филтриране по: %{name}" + select_to_filter: "Изберете стойност за филтриране" default_header_text: Изберете... + no_content: Няма намерени съвпадения + results_count: + one: "%{count} резултат" + other: "%{count} резултата" filter_placeholder: Търсене ... + filter_placeholder_with_any: Търсете или създайте... + create: "Създаване: '%{content}'" + max_content_reached: + one: "Можете да изберете само %{count} артикул." + other: "Можете да изберете само %{count} елемента." + min_content_not_reached: + one: "Изберете поне %{count} елемент." + other: "Изберете поне %{count} елемента." + invalid_selection_length: + one: "Изборът трябва да съдържа поне %{count} знак." + other: "Изборът трябва да съдържа поне %{count} знака." + components: + tag_drop: + filter_for_more: Филтрирайте за повече... + categories_admin_dropdown: + title: "Управление на категории" date_time_picker: from: От to: До emoji_picker: filter_placeholder: Търсене на имотикони + smileys_&_emotion: Усмивки и емоция + people_&_body: Хората и Тялото + animals_&_nature: Животни и природа + food_&_drink: Храни и напитки + travel_&_places: Пътувания и места + activities: Дейности + objects: Обекти + symbols: Символи flags: Сигнали + recent: Използван наскоро + default_tone: Без тон на кожата + light_tone: Светъл тон на кожата + medium_light_tone: Средно светъл тон на кожата + medium_tone: Среден тон на кожата + medium_dark_tone: Средно тъмен тон на кожата + dark_tone: Тъмен тон на кожата + default: Персонализирани емоджи + shared_drafts: + title: "Споделени чернови" + notice: "Тази тема е видима само за тези, които могат да публикуват споделени чернови." composer: emoji: "Емошънка :)" more_emoji: "още..." @@ -1251,38 +1818,69 @@ bg: unlist: "скрити" add_warning: "Това е официално предупреждение." toggle_whisper: "Включи шепот" + toggle_unlisted: "Превключване на неизброени" posting_not_on_topic: "На коя тема искате да отговорите ?" saved_local_draft_tip: "запазено локално" similar_topics: "Вашата тема е подобна на..." drafts_offline: "чернови офлайн" + edit_conflict: "редактиране на конфликта" + group_mentioned_limit: + one: "Внимание! Споменахте %{group}, но тази група има повече членове от ограничението за споменаване, конфигурирано от администратора, от %{count} потребители. Никой няма да бъде уведомен." + other: "Внимание! Споменахте %{group}, но тази група има повече членове от ограничението за споменаване, конфигурирано от администратора, от %{count} потребители. Никой няма да бъде уведомен." + group_mentioned: + one: "Споменавайки %{group}, вие ще уведомите %{count} човек – сигурни ли сте?" + other: "Споменавайки %{group}, вие ще уведомите %{count} души – сигурни ли сте?" + cannot_see_mention: + category: "Споменахте %{username} но те няма да бъдат уведомени, защото нямат достъп до тази категория. Ще трябва да ги добавите към група, която има достъп до тази категория." + private: "Споменахте %{username} но те няма да бъдат уведомени, защото не могат да видят това лично съобщение. Ще трябва да ги поканите на това PM." + duplicate_link: "Изглежда, че връзката ви към %{domain} вече е публикувана в темата от @%{username} от отговор на %{ago} – сигурни ли сте, че искате да я публикувате отново?" + reference_topic_title: "RE: %{title}" error: title_missing: "Заглавието е задължително" + post_missing: "Публикацията не може да бъде празна" + try_like: "Пробвахте ли бутона %{heart}" category_missing: "Трябва да изберете категория" + topic_template_not_modified: "Моля, добавете подробности към вашата тема, като редактирате шаблона на темата." save_edit: "Запази редакцията" + overwrite_edit: "Презаписване Редактиране" reply_original: "Отговори на Оригинална Тема" reply_here: "Отговори тук" reply: "Отговорете" cancel: "Прекрати" create_topic: "Създай тема" create_pm: "Съобщение" + create_whisper: "Шепот" + create_shared_draft: "Създаване на споделена чернова" + edit_shared_draft: "Редактиране на споделена чернова" + title: "Или натиснете %{modifier}Enter" users_placeholder: "Добави потребител" title_placeholder: "За какво става дума в дискусията с едно изречение?" title_or_link_placeholder: "Напишете заглавие или поставете линк тук" edit_reason_placeholder: "защо редактирате ?" + topic_featured_link_placeholder: "Въведете връзка, показана със заглавие." + remove_featured_link: "Премахнете връзката от темата." reply_placeholder: "Пиши тук. Използвай Markdown, BBCode, или HTML за форматиране. Издърпайте или поставете изображенията." + reply_placeholder_no_images: "Пиши тук. Използвайте Markdown, BBCode или HTML за форматиране." + reply_placeholder_choose_category: "Изберете категория, преди да пишете тук." view_new_post: "Вижте публикацията." saving: "Запаметяване" saved: "Запазено!" + saved_draft: "Публикуването на чернова е в ход. Докоснете, за да възобновите." uploading: "Качва се..." + show_preview: "Покажи преглед" + hide_preview: "скрий преглед" quote_post_title: "Цитирай цялата публикация" + bold_label: "Б" bold_title: "Удебелен" bold_text: "удебелен текст" + italic_label: "АЗ" italic_title: "Италик" italic_text: "Подчертан текст" link_title: "Хипервръзка" link_description: "добави описание на връзката тук" link_dialog_title: "Добави хипервръзка" link_optional_text: "заглавие по избор" + link_url_placeholder: "Поставете URL или въведете, за да търсите теми" blockquote_title: "Текстов блок" blockquote_text: "Текстов блок" code_title: "Форматиран текст" @@ -1293,16 +1891,47 @@ bg: olist_title: "Номериран списък" ulist_title: "Списък с водещи символи" list_item: "Списък" + toggle_direction: "Превключване на посоката" help: "Помощ с Markdown" + collapse: "минимизирайте панела на композитора" + open: "отворете панела на композитора" + abandon: "затворете композитора и изхвърлете черновата" + enter_fullscreen: "Отворете композитор в пълен екранен" + exit_fullscreen: "излезте от композитора на цял екран" + show_toolbar: "показване на лентата с инструменти на композитора" + hide_toolbar: "скриване на лентата с инструменти на композитора" modal_ok: "Ок" modal_cancel: "Отмени" cant_send_pm: "Съжеляваме, но неможете да изпращате съобщения до %{username}." + yourself_confirm: + title: "Забравихте ли да добавите получатели?" + body: "В момента това съобщение се изпраща само до вас!" + slow_mode: + error: "Тази тема е в бавен режим. Вече публикувахте наскоро; можете да публикувате отново в %{timeLeft}." admin_options_title: "Допълнителни настройки за тази тема" composer_actions: reply: Отговорете + draft: Чернова edit: Редактирай + reply_to_post: + label: Отговорете на публикация от %{postUsername} + desc: Отговорете на конкретна публикация + reply_as_new_topic: + label: Отговорете като свързана тема + desc: Създайте нова тема, свързана с тази тема + confirm: Имате запазена чернова на нова тема, която ще бъде презаписана, ако създадете свързана тема. + reply_as_new_group_message: + label: Отговорете като ново групово съобщение + desc: Създайте ново съобщение, започващо със същите получатели + reply_as_private_message: + label: Ново съобщение + desc: Създайте ново лично съобщение reply_to_topic: label: Отговорете на тема + desc: Отговорете на темата, а не на конкретен пост + toggle_whisper: + label: Превключете шепот + desc: Шепотът се вижда само от служителите create_topic: label: "Нова тема" notifications: @@ -1310,6 +1939,9 @@ bg: none: "В момента не могат да бъдат заредени уведомленията." empty: "Няма намерени нотификации." reviewable_items: "точки, изискващи преглед" + dismiss_confirmation: + dismiss: "Отмени" + cancel: "Отмени" popup: mentioned: '%{username} ви спомена в "%{topic}" - %{site_title}' group_mentioned: '%{username} ви спомена в "%{topic}" - %{site_title}' @@ -1320,21 +1952,47 @@ bg: confirm_title: "Включени известявания - %{site_title}" confirm_body: "Успех! Известяването е включено." titles: + liked: "ново харесване" + private_message: "ново лично съобщение" + invited_to_private_message: "поканени на лично съобщение" + invitee_accepted: "поканата е приета" + posted: "нова публикация" + moved_post: "постът е преместен" + linked: "свързани" + bookmark_reminder: "напомняне за отметка" + bookmark_reminder_with_name: "напомняне за отметка - %{name}" + granted_badge: "предоставена значка" + invited_to_topic: "поканен за темата" + group_mentioned: "спомената група" + group_message_summary: "нови групови съобщения" watching_first_post: "нова тема" + topic_reminder: "напомняне на темата" + liked_consolidated: "нови харесвания" post_approved: "публикацията е одобрена" + membership_request_consolidated: "нови заявки за членство" + reaction: "нова реакция" + votes_released: "Гласуването беше публикувано" upload_selector: uploading: "Качване " + processing: "Обработка на качване" select_file: "Избери файл" default_image_alt_text: изображение search: sort_by: "Сортирай по" relevance: "Приложимост" latest_post: "Последен пост" + latest_topic: "Последна тема" most_viewed: "Най-четени" most_liked: "Най-харесвани" select_all: "Избери Всички " clear_all: "Изчисти Всички" too_short: "Думата за търсене е твърде кратка." + open_advanced: "Отворете разширеното търсене" + clear_search: "Изчистване на търсенето" + sort_or_bulk_actions: "Сортирайте или групово изберете резултатите" + result_count: + one: "%{count} резултат за%{term}" + other: "%{count}%{plus} резултата за%{term}" title: "Търсене" full_page_title: "Търсене" no_results: "Няма резултати " @@ -1342,30 +2000,59 @@ bg: post_format: "#%{post_number} от %{username} " results_page: "Резултати от търсенето на '%{term}'" more_results: "Има повече резултати. Моля, прецизирайте търсенето си." + cant_find: "Не можете да намерите това, което търсите?" + start_new_topic: "Може би да започнем нова тема?" or_search_google: "Или вместо това опитайте търсене с Гугъл:" search_google: "Опитайте вместо това търсене с Гугъл:" search_google_button: "Google" search_button: "Търсене" + search_term_label: "въведете ключова дума за търсене" categories: "Категории" tags: "Етикети" + in: "в" + in_this_topic: "в тази тема" + in_this_topic_tooltip: "превключете към търсене по всички теми" + in_topics_posts: "във всички теми и публикации" + enter_hint: "или натиснете Enter" + in_posts_by: "в публикации от %{username}" type: + default: "Теми/публикации" users: "Потребители" categories: "Категории" + categories_and_tags: "Категории/тагове" context: user: "Търсете публикация от @%{username}" category: "Търсене за категория #%{category}" + tag: "Търсете маркера%{tag}" topic: "Търсете тази тема" private_messages: "Търси съобщения" + tips: + category_tag: "филтри по категория или таг" + author: "филтри по автор на публикацията" + in: "филтри по метаданни (напр. в:заглавие, в:лично, в:закрепено)" + status: "филтри по статус на темата" + full_search: "стартира търсене в цялата страница" + full_search_key: "%{modifier} + Enter" advanced: + title: Разширени филтри posted_by: label: Публикувано от + aria_label: Филтриране по автор на публикацията + in_category: + label: Категоризирани in_group: label: В група with_badge: label: Със значка + with_tags: + label: Тагнат + aria_label: Филтрирайте с помощта на тагове filters: + label: Връщане само на теми/публикации... + title: Съвпадение само в заглавието likes: Аз харесах posted: Аз публикувах в + created: Аз създадох watching: Аз наблюдавам tracking: Аз следя first: е първата публикация @@ -1482,24 +2169,85 @@ bg: jump_reply_down: към по-късен отговор deleted: "Темата беше изтрита" slow_mode_update: + title: "Бавен режим" + select: "Потребителите могат да публикуват в тази тема само веднъж на всеки:" + description: "За да насърчават обмислена дискусия в бързо движещи се или спорни дискусии, потребителите трябва да изчакат, преди да публикуват отново в тази тема." enable: "Позволи" + update: "Актуализация" + enabled_until: "Активирано до:" remove: "Деактивиране" + hours: "Часове:" + minutes: "Минути:" + seconds: "Секунди:" + durations: + 10_minutes: "10 Минути" + 15_minutes: "15 Минути" + 30_minutes: "30 Минути" + 45_minutes: "45 Минути" + 1_hour: "1 Час" + 2_hours: "2 Часа" + 4_hours: "4 Часа" + 8_hours: "8 Часа" + 12_hours: "12 Часа" + 24_hours: "24 Часа" + custom: "Персонализирана продължителност" + slow_mode_notice: + duration: "Моля, изчакайте %{duration} между публикациите в тази тема" topic_status_update: + title: "Таймер за тема" + save: "Задайте таймер" + num_of_hours: "Брой часове:" + num_of_days: "Брой дни:" + remove: "Премахване на таймера" + publish_to: "Публикуване на:" when: "Кога:" + time_frame_required: "Моля, изберете времева рамка" + min_duration: "Продължителността трябва да е по-голяма от 0" + max_duration: "Продължителността трябва да бъде по-малка от 20 години" duration: "Продължителност" auto_update_input: none: "Избери времева рамка" + now: "Сега" later_today: "По-късно днес" tomorrow: "Утре" later_this_week: "По-късно тази седмица" this_weekend: "Този уикенд" next_week: "Следваща седмица" + two_weeks: "Две седмици" next_month: "Следващия месец" + two_months: "Два месеца" + three_months: "Три месеца" + four_months: "Четири месеца" + six_months: "Шест месеца" + one_year: "Една година" forever: "Завинаги" + pick_date_and_time: "Изберете дата и час" + set_based_on_last_post: "Затваряне въз основа на последната публикация" + publish_to_category: + title: "График за публикуване" + temp_open: + title: "Отворете временно" + auto_reopen: + title: "Автоматично отваряне на тема" + temp_close: + title: "Затворете временно" auto_close: + title: "Автоматично затваряне на тема" + label: "Автоматично затваряне на темата след:" error: "Моля, въведете валидна стойност." based_on_last_post: "Не затваряйте преди последната публикация да бъде поне толкова стара." + auto_close_after_last_post: + title: "Автоматично затваряне на темата след последната публикация" + auto_delete: + title: "Автоматично изтриване на тема" + auto_bump: + title: "Тема за автоматично Bump" + reminder: + title: "Напомни ми" + auto_delete_replies: + title: "Автоматично изтриване на отговори" status_update_notice: + auto_open: "Тази тема автоматично ще се отвори %{timeLeft}." auto_close: "Тази тема ще се затвори автоматично след %{timeLeft}." auto_close_after_last_post: "Тази тема ще се затвори %{duration} след последния отговор. " auto_close_title: "Настройки за автоматично затваряне" @@ -1664,14 +2412,41 @@ bg: other: "Моля, изберете тема, в която искате да преместите тези %{count} публикации. " move_to_new_message: radio_label: "Ново Съобщение" + move_to_existing_message: + instructions: + one: "Моля, изберете съобщението, в което искате да преместите тази публикация." + other: "Моля, изберете съобщението, в което искате да преместите тези %{count} публикации." + merge_posts: + title: "Обединяване на избрани публикации" + action: "обединете избраните публикации" + error: "Възникна грешка при обединяването на избраните публикации." publish_page: title: "Публикуване на страници" + publish: "Публикувайте" + description: "Когато дадена тема е публикувана като страница, нейният URL адрес може да бъде споделен и ще се показва с персонализиран стил." + slug: "Slug" public: "Публични" + public_description: "Хората могат да виждат страницата, дори ако свързаната тема е частна." + publish_url: "Вашата страница е публикувана на адрес:" + topic_published: "Вашата тема е публикувана на адрес:" + preview_url: "Вашата страница ще бъде публикувана на адрес:" + invalid_slug: "За съжаление не можете да публикувате тази страница." + unpublish: "Прекратяване на публикуването" + unpublished: "Страницата ви е непубликувана и вече не е достъпна." + publishing_settings: "Настройки за публикуване" change_owner: + title: "Смяна на собственика" action: "смени собственика" error: "Възникна грешка при смяната на собственика" placeholder: "име на новия собственик" + instructions: + one: "Моля, изберете нов собственик за публикацията на @%{old_user}" + other: "Моля, изберете нов собственик за %{count} публикации от @%{old_user}" + instructions_without_old_user: + one: "Моля, изберете нов собственик за публикацията" + other: "Моля, изберете нов собственик за %{count} публикации" change_timestamp: + title: "Промяна на времевия печат..." action: "смени времевия показател" invalid_timestamp: "Времевия показател неможе да бъде в бъдещето." error: "Грешка при смяната на времевия показател." @@ -1681,8 +2456,16 @@ bg: selected: "избрани (%{count})" select_post: label: "избери" + title: "Добавете публикация към избора" + selected_post: + label: "избрани" + title: "Кликнете, за да премахнете публикацията от избора" select_replies: label: "избери +отговори " + title: "Добавете публикация и всички нейни отговори към избора" + select_below: + label: "изберете + по-долу" + title: "Добавете публикация и всичко след нея към избор" delete: изтрий избраните cancel: прекрати избирането select_all: избери всички @@ -1690,24 +2473,40 @@ bg: description: one: Вие избрахте %{count} публикация. other: "Вие избрахте %{count} публикации. " + deleted_by_author_simple: "(темата е изтрита от автора)" post: + quote_reply: "Цитат" + quote_reply_shortcut: "Или натиснете q" quote_edit: "Редактирай" + quote_edit_shortcut: "Или натиснете e" quote_share: "Споделяне" edit_reason: "Причина: " post_number: "публикация %{number} " + ignored: "Игнорирано съдържание" + wiki_last_edited_on: "wiki последно редактирано на %{dateTime}" + last_edited_on: "последна редакция на публикацията на %{dateTime}" reply_as_new_topic: "Отговори като свързана тема" + reply_as_new_private_message: "Отговорете като ново съобщение до същите получатели" continue_discussion: "Продължаване на дискусията от %{postLink}: " follow_quote: "отиди на цитираната публикация " show_full: "Покажи цялата публикация" + show_hidden: "Преглед на игнорираното съдържание." + deleted_by_author_simple: "(публикацията е изтрита от автора)" collapse: "намали" expand_collapse: "разшири/намали " + locked: "служител е блокирал тази публикация от редактиране" gap: one: "покажи %{count} скрит отговор" other: "покажи %{count} скрити отговора" + notice: + new_user: "Това е първият път, когато %{user} публикува — нека гo приветстваме в нашата общност!" + returning_user: "Измина известно време, откакто не сме виждали %{user} — последната им публикация беше %{time}." unread: "Публикацията е непрочетена" has_replies: one: "%{count} Отговор" other: "%{count} Отговори" + has_replies_count: "%{count}" + unknown_user: "(неизвестен/изтрит потребител)" has_likes_title: one: "%{count} човек харесва тази публикация" other: "%{count} човека харесват тази публикация" @@ -1715,15 +2514,32 @@ bg: has_likes_title_you: one: "вие и още %{count} човек сте харесали този пост" other: "вие и %{count} човека сте харесали този пост" + filtered_replies_hint: + one: "Вижте тази публикация и нейния отговор" + other: "Вижте тази публикация и нейните %{count} отговора" + filtered_replies_viewing: + one: "Преглед на %{count} отговор на" + other: "Преглед на %{count} отговора на" + in_reply_to: "Заредете родителска публикация" + view_all_posts: "Вижте всички публикации" errors: create: "При създаването на Вашата публикация се получи грешка. Моля, опитайте отново." edit: "Съжаляваме, възникна грешка при редактирането на публикацията. Моля, опитайте отново. " upload: "Съжаляваме, възникна грешка при качването на този файл. Моля, опитайте отново." + file_too_large: "За съжаление този файл е твърде голям (максималният размер е %{max_size_kb}kb). Защо не качите големия си файл в услуга за споделяне в облак, след което поставете връзката?" + file_too_large_humanized: "За съжаление този файл е твърде голям (максималният размер е %{max_size}). Защо не качите големия си файл в услуга за споделяне в облак, след което поставете връзката?" too_many_uploads: "Съжаляваме, не можете да качвате повече от един файл наведнъж." + too_many_dragged_and_dropped_files: + one: "За съжаление можете да качвате само по %{count} файл наведнъж." + other: "За съжаление можете да качвате само по %{count} файла наведнъж." upload_not_authorized: "Съжеляваме, Файлът е забранен за качване (разрешени разширения : %{authorized_extensions})." image_upload_not_allowed_for_new_user: "Съжаляваме, новите потребители не могат да качват снимки." attachment_upload_not_allowed_for_new_user: "Съжаляваме, новите потребители не могат да прикачват файлове." attachment_download_requires_login: "Съжаляваме, трябва да сте логнат, за да може да сваляте прикачените файлове." + cancel_composer: + confirm: "Какво бихте искали да направите с публикацията си?" + discard: "Отхвърляне" + save_draft: "Запазете чернова за по-късно" via_email: "тази публикация пристига чрез имейл" whisper: "този пост е отбелязан като таен за модераторите" wiki: diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index fd49707b0d..09969ca97d 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -1821,6 +1821,9 @@ bs_BA: watching_first_post: "Nova tema %{description}" reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" + dismiss_confirmation: + dismiss: "Odpusti" + cancel: "Odustani" group_message_summary: one: "%{count} poruka u vašem %{group_name} sandučiću" few: "%{count} poruke u vašem %{group_name} sandučiću" diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml index 027b34a6b6..939ec08c85 100644 --- a/config/locales/client.ca.yml +++ b/config/locales/client.ca.yml @@ -1700,6 +1700,9 @@ ca: membership_request_accepted: "Membre acceptat en '%{group_name}'" reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" + dismiss_confirmation: + dismiss: "Descarta-ho" + cancel: "Cancel·la" group_message_summary: one: "%{count} missatge en la vostra bústia de %{group_name}" other: "%{count} missatges en la vostra bústia de %{group_name}" diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index e3d7eabb45..51fb7c9332 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -1684,6 +1684,9 @@ cs: watching_first_post: "Nové téma %{description}" reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" + dismiss_confirmation: + dismiss: "Označit jako přečtené" + cancel: "Zrušit" group_message_summary: one: "%{count} zpráva ve schránce skupiny %{group_name}" few: "%{count} zprávy ve schránce skupiny %{group_name}" diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index b5e8c62810..ff4c3be905 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -1447,7 +1447,7 @@ da: invite: new_title: "Opret Invitation" edit_title: "Rediger Invitation" - instructions: "Del dette link for øjeblikkeligt at give adgang til dette websted" + instructions: "Del dette link for øjeblikkeligt at give adgang til dette websted:" copy_link: "kopier link" show_advanced: "Vis Avancerede Indstillinger" hide_advanced: "Skjul Avancerede Indstillinger" @@ -1457,7 +1457,6 @@ da: send_invite_email: "Gem og send e-mail" save_invite: "Gem Invitation" invite_saved: "Invitation gemt." - invite_copied: "Inviteringslink kopieret." bulk_invite: none: "Ingen invitationer at vise på denne side." text: "Masseinvitation" @@ -2034,6 +2033,9 @@ da: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - afsluttet" + dismiss_confirmation: + dismiss: "Ignorer Alle" + cancel: "Afbryd" group_message_summary: one: "%{count} besked i din %{group_name} indbakke" other: "%{count} beskeder i din %{group_name} indbakke" diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 13ad9ca8d3..5c56c338ab 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -1478,22 +1478,22 @@ de: invite: new_title: "Einladung erstellen" edit_title: "Einladung bearbeiten" - instructions: "Teile diesen Link, um sofort Zugriff auf diese Website zu gewähren" + instructions: "Teile diesen Link, um sofort Zugriff auf folgende Seite zu gewähren:" copy_link: "Link kopieren" expires_in_time: "Läuft in %{time} ab" expired_at_time: "Abgelaufen um %{time}" show_advanced: "Erweiterte Optionen anzeigen" hide_advanced: "Erweiterte Optionen ausblenden" - restrict_email: "Auf eine E-Mail-Adresse beschränken" + restrict_email: "Auf E-Mail beschränken" max_redemptions_allowed: "Max. Verwendungen" add_to_groups: "Zu Gruppen hinzufügen" - invite_to_topic: "Dieses Thema aufrufen" + invite_to_topic: "Ankommen beim Thema" expires_at: "Verfällt nach" custom_message: "Optionale persönliche Nachricht" send_invite_email: "Speichern und E-Mail senden" + send_invite_email_instructions: "Einladung auf E-Mail beschränken, um eine Einladungs-E-Mail zu senden" save_invite: "Einladung speichern" invite_saved: "Einladung gespeichert." - invite_copied: "Einladungslink kopiert." bulk_invite: none: "Keine Einladungen, die auf dieser Seite angezeigt werden können." text: "Massen-Einladung" @@ -2084,6 +2084,12 @@ de: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} – abgeschlossen" + dismiss_confirmation: + body: + one: "Bist du sicher? Du hast %{count} wichtige Benachrichtigung." + other: "Bist du sicher? Du hast %{count} wichtige Benachrichtigungen." + dismiss: "Alles gelesen" + cancel: "Abbrechen" group_message_summary: one: "%{count} Nachricht in deinem „%{group_name}“-Posteingang" other: "%{count} Nachrichten in deinem „%{group_name}“-Posteingang" @@ -2583,6 +2589,9 @@ de: help: "teile einen Link zu diesem Thema" instructions: "Link zu diesem Thema teilen:" copied: "Themen-Link kopiert." + restricted_groups: + one: "Nur für Mitglieder der Gruppe sichtbar: %{groupNames}" + other: "Nur für Gruppenmitglieder sichtbar: %{groupNames}" notify_users: title: "Benachrichtige" instructions: "Folgende Benutzer über dieses Thema benachrichtigen:" @@ -3411,6 +3420,7 @@ de: title: "Suchmenü" prev_next: "%{shortcut} Auswahl bewegen ↑ ↓" insert_url: "%{shortcut} Auswahl in geöffneten Editor einfügen" + full_page_search: "%{shortcut} Startet die ganzseitige Suche" badges: earned_n_times: one: "Abzeichen %{count}-mal erhalten" @@ -3856,6 +3866,8 @@ de: wordpress: Notwendig, damit das „wp-discourse“-Plug-in für WordPress funktioniert. posts: edit: Bearbeite jeden Beitrag oder einen bestimmten. + uploads: + create: Lade eine neue Datei hoch. users: bookmarks: Listet die Lesezeichen des Benutzers auf. Gibt Lesezeichen-Erinnerungen zurück, wenn du das ICS-Format verwendest. sync_sso: Synchronisiere einen Benutzer mit DiscourseConnect. diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml index ef55e07c9b..ad5b11d1d9 100644 --- a/config/locales/client.el.yml +++ b/config/locales/client.el.yml @@ -1801,6 +1801,9 @@ el: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - ολοκληρώθηκε" + dismiss_confirmation: + dismiss: "Απόρριψη" + cancel: "Άκυρο" group_message_summary: one: "%{count} μήνυμα στα εισερχόμενα της ομάδας %{group_name}" other: "%{count} μηνύματα στα εισερχόμενα της ομάδας %{group_name} " diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 25f2c82a1d..f3bc77e218 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -1475,22 +1475,19 @@ es: invite: new_title: "Crear invitación" edit_title: "Editar invitación" - instructions: "Comparte este enlace para dar acceso inmediato al sitio" + instructions: "Comparte este enlace para dar acceso instantáneo a este sitio:" copy_link: "copiar enlace" expires_in_time: "Caduca en %{time}" expired_at_time: "Caducada en %{time}" show_advanced: "Mostrar opciones avanzadas" hide_advanced: "Ocultar opciones avanzadas" - restrict_email: "Restringir a una dirección de correo electrónico" max_redemptions_allowed: "Máximo de usos" add_to_groups: "Añadir a grupos" - invite_to_topic: "Redirigir a este tema" expires_at: "Caducar tras" custom_message: "Mensaje personal opcional" send_invite_email: "Guardar y enviar correo electrónico" save_invite: "Guardar invitación" invite_saved: "Invitación guardada." - invite_copied: "Enlace de invitación copiado." bulk_invite: none: "No hay invitaciones para mostrar en esta página." text: "Invitaciones en masa" @@ -2081,6 +2078,9 @@ es: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - completado" + dismiss_confirmation: + dismiss: "Descartar" + cancel: "Cancelar" group_message_summary: one: "%{count} mensaje en tu bandeja de %{group_name}" other: "%{count} mensajes en tu bandeja de %{group_name} " diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml index 3feda31cbd..2aa14aaf9f 100644 --- a/config/locales/client.et.yml +++ b/config/locales/client.et.yml @@ -1461,6 +1461,9 @@ et: watching_first_post: "New Topic %{description}" reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" + dismiss_confirmation: + dismiss: "Ignoreeri" + cancel: "Tühista" popup: mentioned: '%{username} mainis Sind teemas "%{topic}" - %{site_title}' group_mentioned: '%{username} mainis Sind teemas "%{topic}" - %{site_title}' diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index 879508df07..aa81ea9e16 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -1326,16 +1326,18 @@ fa_IR: invite: new_title: "ایجاد دعوت‌نامه" edit_title: "ویرایش دعوت‌نامه" - instructions: "این لینک را برای ارائه دسترسی فوری به سایت٬ به اشتراک بگذارید" + instructions: "این لینک را برای ارائه دسترسی فوری به سایت٬ به اشتراک بگذارید:" copy_link: "کپی پیوند" show_advanced: "نمایش تنظیمات پیشرفته" hide_advanced: "پنهان کردن تنظیمات پیشرفته" + restrict_email: "محدود کردن به ایمیل" add_to_groups: "افزودن به گروه‌ها" + invite_to_topic: "وارد شدن به موضوع" expires_at: "انقضا بعد از" send_invite_email: "ذخیره و ارسال ایمیل" + send_invite_email_instructions: "محدود کردن ارسال ایمیل برای ارسال دعوت‌نامه" save_invite: "ذخیره دعوت‌نامه" invite_saved: "دعوتنامه ذخیره شد." - invite_copied: "لینک دعوت کپی شد." bulk_invite: none: "دعوتنامه ای برای نمایش در این صفحه موجود نیست." text: "دعوت به تعداد بالا" @@ -1850,6 +1852,12 @@ fa_IR: membership_request_accepted: "عضویت در %{group_name} پذیرفته‌شد" reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" + dismiss_confirmation: + body: + one: "آيا مطمئن هستی؟ شما %{count} آگاه‌سازی مهم دارید." + other: "آيا مطمئن هستی؟ شما %{count} آگاه‌سازی مهم دارید." + dismiss: "نادیده گرفتن" + cancel: "انصراف" group_message_summary: one: "%{count}پیام در اینباکس %{group_name}" other: "%{count}پیام در اینباکس %{group_name}" @@ -1914,6 +1922,7 @@ fa_IR: search_button: "جسنجو" categories: "دسته‌بندی‌ها" tags: "برچسب‌ها" + browser_tip: "%{modifier} + f" type: users: "کاربران" categories: "دسته‌بندی‌ها" @@ -2902,6 +2911,8 @@ fa_IR: mark_watching: "%{shortcut} نمایش موضوع" print: "%{shortcut} چاپ موضوع" defer: "تاپیک‌های به تعویق افتاده %{shortcut}" + search_menu: + full_page_search: "%{shortcut} جستجوی تمام صفحه را راه‌اندازی می‌کند" badges: earned_n_times: one: "این مدال را %{count} بار به دست آورده" @@ -3198,6 +3209,9 @@ fa_IR: read_only: فقط خواندنی global: جهانی action: اقدام + descriptions: + uploads: + create: یک پرونده جدید بارگذاری کنید. web_hooks: title: "webhook ها" none: "در حال حاضر webhook‌ی وجود ندارد" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index e2d9865198..a04bba611f 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -1452,22 +1452,19 @@ fi: invite: new_title: "Luo kutsu" edit_title: "Muokkaa kutsua" - instructions: "Jaa tämä linkki, jotta voit välittömästi myöntää pääsyn tälle sivustolle" + instructions: "Jaa tämä linkki, jotta voit välittömästi myöntää pääsyn tälle sivustolle:" copy_link: "kopioi linkki" expires_in_time: "Vanhenee %{time}" expired_at_time: "Vanhentunut %{time}" show_advanced: "Näytä lisäasetukset" hide_advanced: "Piilota lisäasetukset" - restrict_email: "Rajoita yhteen sähköpostiosoitteeseen" max_redemptions_allowed: "Käyttökertoja enintään" add_to_groups: "Lisää ryhmiin" - invite_to_topic: "Saavu tähän ketjuun" expires_at: "Aikaa vanhenemiseen" custom_message: "Valinnainen henkilökohtainen viesti" send_invite_email: "Tallenna ja lähetä sähköposti" save_invite: "Tallenna kutsu" invite_saved: "Kutsu tallennettu." - invite_copied: "Kutsulinkki kopioitu." bulk_invite: none: "Ei näytettäviä kutsuja tällä sivulla." text: "Joukkokutsu" @@ -2042,6 +2039,9 @@ fi: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} – valmis" + dismiss_confirmation: + dismiss: "Kuittaa" + cancel: "Peruuta" group_message_summary: one: "%{count} viesti ryhmän %{group_name} saapuneissa" other: "%{count} viestiä ryhmän %{group_name} saapuneissa" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index e50c3999a8..d036981005 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -1452,22 +1452,19 @@ fr: invite: new_title: "Créer une invitation" edit_title: "Modifier l'invitation" - instructions: "Partagez ce lien pour donner instantanément accès au forum" + instructions: "Partagez ce lien pour donner instantanément accès au site :" copy_link: "copier le lien" expires_in_time: "Arrivera à expiration dans %{time}" expired_at_time: "Arrivée à expiration le %{time}" show_advanced: "Afficher les options avancées" hide_advanced: "Masquer les options avancées" - restrict_email: "Restreindre l'invitation à une adresse de courriel donnée" max_redemptions_allowed: "Nombre max. d'utilisations" add_to_groups: "Ajouter la personne invitée à ces groupes" - invite_to_topic: "Diriger vers ce sujet" expires_at: "Ce lien expirera dans" custom_message: "Message personnel (facultatif)" send_invite_email: "Enregistrer et envoyer le courriel" save_invite: "Enregistrer l'invitation" invite_saved: "Invitation enregistrée." - invite_copied: "Lien d'invitation copié." bulk_invite: none: "Aucune invitation à afficher sur cette page." text: "Invitation en masse" @@ -2039,6 +2036,9 @@ fr: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - terminé" + dismiss_confirmation: + dismiss: "Vu" + cancel: "Annuler" group_message_summary: one: "%{count} message dans la boîte de réception de %{group_name}" other: "%{count} messages dans la boîte de réception de %{group_name}" diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml index ff3a5e8726..7a927f5a07 100644 --- a/config/locales/client.gl.yml +++ b/config/locales/client.gl.yml @@ -1403,7 +1403,7 @@ gl: invite: new_title: "Crear convite" edit_title: "Editar convite" - instructions: "Compartir esta ligazón para conceder acceso a este sitio" + instructions: "Compartir esta ligazón para conceder acceso a este sitio:" copy_link: "copiar a ligazón" show_advanced: "Amosar opcións avanzadas" hide_advanced: "Agochar opcións avanzadas" @@ -1974,6 +1974,9 @@ gl: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - completado" + dismiss_confirmation: + dismiss: "Desbotar" + cancel: "Cancelar" group_message_summary: one: "%{count} mensaxe na caixa %{group_name}" other: "%{count} mensaxes na caixa %{group_name}" diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 0159af4e32..6ecfbd8b60 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -1585,22 +1585,22 @@ he: invite: new_title: "יצירת הזמנה" edit_title: "עריכת הזמנה" - instructions: "ניתן לשתף את הקישור הזה באופן מיידי כדי להעניק גישה לאתר" + instructions: "ניתן לשתף את הקישור הזה באופן מיידי כדי להעניק גישה לאתר:" copy_link: "העתקת קישור" expires_in_time: "תפוג בעוד %{time}" expired_at_time: "פגה ב־%{time}" show_advanced: "הצגת אפשרויות מתקדמות" hide_advanced: "הסתרת אפשרויות מתקדמות" - restrict_email: "להגביל לכתובת דוא״ל אחת" + restrict_email: "הגבלה לדוא״ל" max_redemptions_allowed: "כמות שימושים מרבית" add_to_groups: "הוספה לקבוצות" - invite_to_topic: "נחיתה בנושא הזה" + invite_to_topic: "נחיתה בנושא" expires_at: "תפוג לאחר" custom_message: "הודעה אישית כרשות" send_invite_email: "לשמור ולשלח דוא״ל" + send_invite_email_instructions: "הגבלת ההזמנה לדוא״ל כדי לשלוח הודעת הזמנה" save_invite: "שמירת הזמנה" invite_saved: "ההזמנה נשמרה." - invite_copied: "קישור ההזמנה הועתק." bulk_invite: none: "אין הזמנות להצגה בעמוד הזה." text: "הזמנה כמותית" @@ -2244,6 +2244,9 @@ he: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - הסתיים" + dismiss_confirmation: + dismiss: "דחה" + cancel: "ביטול" group_message_summary: one: "הודעה %{count} בתיבת ה%{group_name} שלך" two: "%{count} הודעות בתיבת ה%{group_name} שלך" @@ -2331,6 +2334,8 @@ he: in_topics_posts: "בכל הנושאים והפוסטים" enter_hint: "או ללחוץ על Enter" in_posts_by: "בפוסטים מאת %{username}" + browser_tip: "‎%{modifier} + f" + browser_tip_description: "שוב כדי להשתמש בחיפוש המקורי של הדפדפן" type: default: "נושאים/פוסטים" users: "משתמשים" @@ -2759,6 +2764,11 @@ he: help: "שתפו קישור לנושא זה" instructions: "שיתוף קישור לנושא זה:" copied: "קישור הנושא הועתק." + restricted_groups: + one: "גלוי רק לחברי הקבוצה: %{groupNames}" + two: "גלוי רק לחברי הקבוצות: %{groupNames}" + many: "גלוי רק לחברי הקבוצות: %{groupNames}" + other: "גלוי רק לחברי הקבוצות: %{groupNames}" notify_users: title: "להודיע" instructions: "להודיע למשתמשים הבאים על הנושא הזה:" @@ -4141,6 +4151,8 @@ he: wordpress: נחוץ כדי שהתוסף wp-discourse ל־WordPress יעבוד. posts: edit: לערוך כל פוסט שהוא או אחד מסוים. + uploads: + create: העלאת קובץ חדש. users: bookmarks: הצגת סימניות המשתמשים. מחזירה תזכורות לסימניות בעת שימוש בתצורת ICS. sync_sso: סנכרון משתמש באמצעות DiscourseConnect. diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml index 0e888afd07..9c9262b203 100644 --- a/config/locales/client.hu.yml +++ b/config/locales/client.hu.yml @@ -1471,22 +1471,19 @@ hu: invite: new_title: "Meghívási hivatkozás létrehozása" edit_title: "Meghívó szerkesztése" - instructions: "Ossza meg ezt a hivatkozást, hogy azonnal hozzáférést biztosítson ehhez a webhelyhez" + instructions: "Ossza meg ezt a hivatkozást, hogy azonnal hozzáférést biztosítson ehhez a webhelyhez:" copy_link: "hivatkozás másolása" expires_in_time: "%{time} múlva lejár" expired_at_time: "Lejárt: %{time}" show_advanced: "Speciális beállítások megjelenítése" hide_advanced: "Speciális beállítások elrejtése" - restrict_email: "Egy e-mail-címre korlátozás" max_redemptions_allowed: "Max. használat" add_to_groups: "Hozzáadás csoportokhoz" - invite_to_topic: "Érkezés erre a témára" expires_at: "Ennyi idő múlva lejár:" custom_message: "Nem kötelező személyes üzenet" send_invite_email: "Mentés és e-mail küldése" save_invite: "Meghívó mentése" invite_saved: "Meghívó mentve." - invite_copied: "Meghívási hivatkozás másolva." bulk_invite: none: "Nincs megjeleníthető meghívó ezen az oldalon." text: "Tömeges meghívás" @@ -2067,6 +2064,9 @@ hu: reaction: "%{username}%{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} – kész" + dismiss_confirmation: + dismiss: "Elvetés" + cancel: "Mégse" group_message_summary: one: "%{count} Üzenet a %{group_name} postaládában" other: "%{count} Üzenetek a %{group_name} postaládában" diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml index 6986c89b39..29d0ec7c3a 100644 --- a/config/locales/client.hy.yml +++ b/config/locales/client.hy.yml @@ -1661,6 +1661,9 @@ hy: membership_request_accepted: "Անդամակցության հարցումը ընդունվել է՝ '%{group_name}'" reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" + dismiss_confirmation: + dismiss: "Չեղարկել" + cancel: "Չեղարկել" group_message_summary: one: "%{count} հաղորդագրություն Ձեր %{group_name} մուտքային արկղում" other: "%{count} հաղորդագրություն Ձեր %{group_name}-ի մուտքային արկղում" diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index eb9a3940de..b0b02a4c70 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -28,6 +28,7 @@ id: time_with_zone: "HH:mm (z)" time_short_day: "ddd, HH: mm" timeline_date: "MMM YYYY" + long_no_year: "MMM D, j:mm a" long_no_year_no_time: "MMM D" full_no_year_no_time: "MMMM Do" long_with_year: "MMM D, YYYY h:mm a" @@ -136,9 +137,11 @@ id: disabled: "Hilangkan spanduk ini %{when}. Spanduk tidak akan lagi tampil pada bagian teratas di tiap halaman." forwarded: "meneruskan email di atas" topic_admin_menu: "tindakan topik" + skip_to_main_content: "Lewati ke konten utama" wizard_required: "Selamat datang di Discourse baru Anda! Mari kita mulai dengan wizard pengaturan ✨" emails_are_disabled: "Semua surel yang keluar telah dinonaktifkan oleh administrator. Tidak ada pemberitahuan email yang akan dikirimkan." software_update_prompt: + message: "Kami telah memperbarui situs ini, silakan refresh, atau Anda mungkin mengalami perilaku yang tidak terduga." dismiss: "Bubar" bootstrap_mode_enabled: other: "Untuk lebih memudahkan peluncuran situs baru Anda, Anda berada di mode bootstrap. Semua pengguna baru akan mendapat level 1 dan mendapat ringkasan email harian diaktifkan. Hal ini akan otomatis dimatikan ketika pengguna %{count} sudah ikut." @@ -212,6 +215,8 @@ id: max_of_count: "maksimal dari %{count}" character_count: other: "%{count} karakter" + period_chooser: + aria_label: "Filter berdasarkan periode" related_messages: title: "Pesan Terkait" see_all: 'Lihat semua pesan dari @ %{username} ...' @@ -239,6 +244,7 @@ id: contact_info: "Pada kegiatan dari sebuah isu kritikal atau penting terjadi pada situs ini, silahkan kontak kami di %{contact_info}." bookmarked: title: "Penandaan" + edit_bookmark: "Edit Bookmark" clear_bookmarks: "Bersihkan Penandaan" help: bookmark: "Klik untuk membuat penandaan pos pertama di topik ini" @@ -246,6 +252,7 @@ id: bookmarks: not_bookmarked: "tandai pos ini" remove: "Hilangkan penandaan" + delete: "Hapus Bookmark" confirm_clear: "Yakin ingin menghapus semua penandaan Anda dari topik ini?" save: "Simpan" no_timezone: 'Anda belum menetapkan zona waktu. Anda tidak akan dapat mengatur pengingat. Tetapkan satu di profil Anda .' @@ -317,6 +324,7 @@ id: placeholder: "ketikkan judul pesan, url atau id di sini" review: order_by: "Urutkan berdasarkan" + date_filter: "Diposting antara" in_reply_to: "sebagai balasan" explain: formula: "Rumus" @@ -402,6 +410,7 @@ id: priority: title: "Prioritas Minimum" any: "(apa saja)" + low: "Rendah" medium: "Sedang" high: "Tinggi" conversation: @@ -512,6 +521,8 @@ id: other: "%{count} pengguna" edit_columns: save: "Simpan" + group: + all: "semua grup" group_histories: actions: change_group_setting: "Ubah pengaturan grup" @@ -524,6 +535,7 @@ id: member_requested: "Diminta pada" add_members: usernames_placeholder: "nama Pengguna" + usernames_or_emails_placeholder: "nama pengguna atau email" notify_users: "Beritahu pengguna" requests: title: "Permintaan" @@ -536,6 +548,8 @@ id: title: "Mengelola" name: "Nama" full_name: "Nama Lengkap" + add_members: "Tambahkan pengguna" + invite_members: "Undang" delete_member_confirm: "Hapus '%{username}' dari grup '%{group}'?" profile: title: Profil @@ -545,6 +559,8 @@ id: notification: Pemberitahuan email: title: "Email" + enable_smtp: "Aktifkan SMTP" + enable_imap: "Aktifkan IMAP" save_settings: "Simpan Pengaturan" last_updated: "Terakhir diperbarui:" last_updated_by: "oleh" @@ -567,13 +583,17 @@ id: password: "Kata Sandi" settings: title: "Pengaturan" + mailboxes: + disabled: "Dinonaktifkan" membership: title: Keanggotaan access: Mengakses categories: title: Kategori + long_title: "Notifikasi default kategori" tags: title: Label + long_title: "Notifikasi default tag" logs: title: "Log" when: "Ketika" @@ -583,6 +603,8 @@ id: details: "Detil" from: "Dari" to: "Kepada" + permissions: + title: "Izin" public_admission: "Izinkan pengguna untuk bergabung dengan grup secara bebas (Membutuhkan grup yang dapat dilihat oleh umum)" public_exit: "Izinkan pengguna untuk meninggalkan grup dengan bebas" empty: @@ -641,8 +663,18 @@ id: make_owner_description: "Jadikan %{username} sebagai pemilik grup ini" remove_owner: "Hapus sebagai Pemilik" remove_owner_description: "Hapus %{username} sebagai pemilik grup ini" + remove_primary: "Hapus sebagai Utama" + remove_members: "Hapus Anggota" + remove_members_description: "Hapus pengguna yang dipilih dari grup ini" + make_owners: "Jadikan Pemilik" + remove_owners: "Hapus Pemilik" + make_all_primary: "Jadikan Semua Utama" + remove_all_primary: "Hapus sebagai Utama" + remove_all_primary_description: "Hapus grup ini sebagai utama" owner: "Pemilik" + primary: "Utama" forbidden: "Anda tidak diizinkan melihat anggota." + no_filter_matches: "Tidak ada anggota yang cocok dengan pencarian itu." topics: "Topik-topik" posts: "Pos" mentions: "Balasan-balasan" @@ -751,23 +783,36 @@ id: private_messages: "Messages" user_notifications: filters: + filter_by: "Filter Menurut" all: "Semua" read: "Dibaca" unread: "Belum dibaca" + ignore_duration_title: "Abaikan Pengguna" ignore_duration_username: "Nama Pengguna" ignore_duration_when: "Durasi:" ignore_duration_save: "Abaikan" + ignore_duration_time_frame_required: "Silakan pilih kerangka waktu" ignore_no_users: "Anda tidak memiliki pengguna yang diabaikan." ignore_option: "Diabaikan" add_ignored_user: "Tambahkan..." mute_option: "Bisukan" normal_option: "normal" notification_schedule: + title: "Jadwal Notifikasi" + label: "Aktifkan jadwal notifikasi khusus" + midnight: "Tengah malam" none: "Tidak ada" monday: "Senin" + tuesday: "Selasa" + wednesday: "Rabu" + thursday: "Kamis" + friday: "Jumat" + saturday: "Sabtu" + sunday: "Minggu" to: "kepada" activity_stream: "Activity" read: "baca" + read_help: "Topik yang baru saja dibaca" preferences: "Preferensi" feature_topic_on_profile: open_search: "Pilih Topik Baru" @@ -777,6 +822,7 @@ id: clear: title: "Bersihkan" warning: "Yakin ingin menghapus topik unggulan Anda?" + use_current_timezone: "Gunakan Zona Waktu Saat Ini" profile_hidden: "Profil publik pengguna ini disembunyikan." expand_profile: "Perluas" collapse_profile: "Persempit" @@ -799,7 +845,23 @@ id: dismiss_notifications: "Bubarkan Semua" dismiss_notifications_tooltip: "Tandai semua notifikasi belum dibaca telah dibaca" first_notification: "Notifikasi pertama Anda! Pilih untuk memulai." + skip_new_user_tips: + not_first_time: "Bukan pertama kali?" + skip_link: "Lewati tips ini" + read_later: "Aku akan membacanya nanti." theme_default_on_all_devices: "Jadikan ini tema default di semua perangkat saya" + color_scheme_default_on_all_devices: "Setel skema warna default di semua perangkat saya" + color_scheme: "Skema warna" + color_schemes: + default_description: "Default tema" + disable_dark_scheme: "Sama seperti reguler" + dark_instructions: "Anda dapat melihat pratinjau skema warna mode gelap dengan mengaktifkan mode gelap perangkat Anda." + undo: "Reset" + regular: "Umum" + dark: "Mode gelap" + default_dark_scheme: "(bawaan situs)" + dark_mode: "Mode Gelap" + dark_mode_enable: "Aktifkan skema warna mode gelap otomatis" text_size_default_on_all_devices: "Jadikan ini ukuran teks default di semua perangkat saya" allow_private_messages: "Izinkan pengguna lain mengirimi saya pesan pribadi" external_links_in_new_tab: "Buka semua link eksternal ke dalam tab baru" @@ -1360,6 +1422,9 @@ id: other: "menyukai %{count} dari tulisan Anda" invitee_accepted: "%{username} menerima undangan Anda" granted_badge: "Mendapatkan '%{description}'" + dismiss_confirmation: + dismiss: "Bubar" + cancel: "Batal" titles: mentioned: "disebut" replied: "balasan baru" diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index c1d57eece6..54752cc0de 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -1476,22 +1476,19 @@ it: invite: new_title: "Crea invito" edit_title: "Modifica invito" - instructions: "Condividi questo link per garantire l'accesso istantaneo a questo sito" + instructions: "Condividi questo link per concedere istantaneamente l'accesso a questo sito:" copy_link: "copia link" expires_in_time: "Scade tra %{time}" expired_at_time: "Scaduto alle %{time}" show_advanced: "Mostra Opzioni Avanzate" hide_advanced: "Nascondi opzioni avanzate" - restrict_email: "Limita a un solo indirizzo email" max_redemptions_allowed: "Limite max di utilizzi" add_to_groups: "Aggiungi ai gruppi" - invite_to_topic: "Invia a questo argomento" expires_at: "Scadenza:" custom_message: "Messaggio personale facoltativo" send_invite_email: "Salva e invia Email" save_invite: "Salva invito" invite_saved: "Invito salvato." - invite_copied: "Link di invito copiato." bulk_invite: none: "Nessun invito da visualizzare in questa pagina." text: "Inviti di gruppo" @@ -2072,6 +2069,9 @@ it: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - completato" + dismiss_confirmation: + dismiss: "Ignora" + cancel: "Annulla" group_message_summary: one: "%{count} messaggio in arrivo nella casella %{group_name}" other: "%{count} messaggi in arrivo nella casella %{group_name}" @@ -2152,6 +2152,8 @@ it: in_topics_posts: "in tutti gli argomenti e i messaggi" enter_hint: "o premi Invio" in_posts_by: "nei messaggi di @%{username}" + browser_tip: "%{modifier} + f" + browser_tip_description: "di nuovo per utilizzare la ricerca nativa del browser" type: users: "Utenti" categories: "Categorie" @@ -3372,6 +3374,7 @@ it: title: "Menu Cerca" prev_next: "%{shortcut} Sposta la selezione su e giù" insert_url: "%{shortcut} Inserisci la selezione nello strumento di composizione aperto" + full_page_search: "%{shortcut} Avvia la ricerca a pagina intera" badges: earned_n_times: one: "Ha guadagnato questo distintivo %{count} volta" @@ -3803,6 +3806,8 @@ it: wordpress: Necessario al funzionamento del plugin wp-discourse di WordPress. posts: edit: Modifica qualsiasi messaggio o uno specifico. + uploads: + create: Carica un nuovo file. users: bookmarks: Elenca i segnalibri utente. Restituisce i segnalibri quando si utilizza il formato ICS. sync_sso: Sincronizza un utente utilizzando DiscourseConnect. diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 6833033c8c..3003230e5f 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -1399,22 +1399,19 @@ ja: invite: new_title: "招待の作成" edit_title: "招待の編集" - instructions: "このサイトへのアクセスと即時に許可するにはこのリンクを共有します" + instructions: "このサイトへのアクセスと即時に許可するにはこのリンクを共有します:" copy_link: "リンクをコピー" expires_in_time: "%{time} で期限切れ" expired_at_time: "%{time} に期限切れ" show_advanced: "高度なオプションを表示" hide_advanced: "高度なオプションを非表示" - restrict_email: "1 つのメールアドレスに制限" max_redemptions_allowed: "最大使用回数" add_to_groups: "グループに追加" - invite_to_topic: "このトピックに到着" expires_at: "有効期限" custom_message: "オプションの個人メッセージ" send_invite_email: "保存してメールを送信" save_invite: "招待を保存" invite_saved: "招待は保存されました。" - invite_copied: "招待リンクがコピーされました。" bulk_invite: none: "このページに表示する招待はありません。" text: "一括招待" @@ -1962,6 +1959,9 @@ ja: reaction: "%{username} %{description}" reaction_2: "%{username}、%{username2} %{description}" votes_released: "%{description} - 完了" + dismiss_confirmation: + dismiss: "閉じる" + cancel: "キャンセル" group_message_summary: other: "%{group_name} の受信トレイに %{count} 件のメッセージがあります" popup: diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 145d0f4a5a..f2f5ce4f58 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -313,7 +313,7 @@ ko: saved: "저장되었습니다!" upload: "업로드" uploading: "업로드 중..." - uploading_filename: "업르도 중: %{filename}..." + uploading_filename: "업로드 중: %{filename}..." processing_filename: "처리 중: %{filename}..." clipboard: "클립보드" uploaded: "업로드 되었습니다!" @@ -1414,22 +1414,19 @@ ko: invite: new_title: "초대 링크 만들기" edit_title: "초대 수정" - instructions: "이 링크를 공유하여이 사이트에 대한 액세스 권한을 즉시 부여하세요." + instructions: "이 링크를 공유하여 이 사이트에 대한 사용 권한을 즉시 부여할 수 있습니다." copy_link: "링크 복사" expires_in_time: "%{time}후에 만료" expired_at_time: "%{time}에 만료됨" show_advanced: "고급 옵션 표시" hide_advanced: "고급 옵션 숨기기" - restrict_email: "하나의 이메일 주소로 제한" max_redemptions_allowed: "최대 사용" add_to_groups: "그룹에 추가" - invite_to_topic: "이 글로 이동합니다" expires_at: "다음 후 만료" custom_message: "개인 메시지 옵션" send_invite_email: "이메일 저장 및 보내기" save_invite: "초대 저장" invite_saved: "초대가 저장되었습니다." - invite_copied: "초대 링크가 복사되었습니다." bulk_invite: none: "이 페이지에 표시할 초대장이 없습니다." text: "일괄 초대" @@ -1946,6 +1943,8 @@ ko: desc: "최신 회신 날짜를 변경하지 않고 회신" reload: "새로 고침" ignore: "무시" + image_alt_text: + aria_label: 이미지의 대체 텍스트 notifications: tooltip: regular: @@ -1988,6 +1987,9 @@ ko: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - 완료됨" + dismiss_confirmation: + dismiss: "읽음" + cancel: "취소" group_message_summary: other: " %{group_name} 사서함에 %{count}개의 메시지가 있습니다" popup: @@ -3293,6 +3295,8 @@ ko: changed: "바뀐 태그:" tags: "태그" choose_for_topic: "태그 선택" + choose_for_topic_required: + other: "최소한 %{count}개의 태그를 선택해야합니다..." info: "정보" default_info: "이 태그는 카테고리로 제한되지 않으며 동의어가 없습니다. 제한을 추가하려면 이 태그를 태그 그룹에 넣으십시오." category_restricted: "이 태그는 액세스 권한이없는 카테고리로 제한됩니다." @@ -3645,6 +3649,8 @@ ko: 범위를 사용할 때 API키를 특정 엔드 포인트 세트로 제한 할 수 있습니다. 허용 할 매개 변수를 정의 할 수도 있습니다. 여러 값을 구분하려면 쉼표를 사용하십시오. title: 범위 + read_only: 읽기 전용 + global: 글로벌 resource: 자원 action: 동작 allowed_parameters: 허용된 매개 변수 diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml index e38fb11124..27f3514572 100644 --- a/config/locales/client.lt.yml +++ b/config/locales/client.lt.yml @@ -1419,22 +1419,19 @@ lt: invite: new_title: "Sukurti kvietimą" edit_title: "Redaguoti kvietimą" - instructions: "Bendrinkite šią nuorodą, kad akimirksniu suteiktumėte prieigą prie šios svetainės" + instructions: "Bendrinkite šią nuorodą, kad akimirksniu suteiktumėte prieigą prie šios svetainės:" copy_link: "nukopijuoti nuorodą" expires_in_time: "Baigia galioti %{time}" expired_at_time: "Galiojimo laikas baigėsi %{time}" show_advanced: "Rodyti išplėstines parinktis" hide_advanced: "Slėpti išplėstines parinktis" - restrict_email: "Apriboti vieną el. pašto adresą" max_redemptions_allowed: "Maksimaliai naudoja" add_to_groups: "Pridėti prie grupių" - invite_to_topic: "Atvykti į šią temą" expires_at: "Baigia galioti" custom_message: "Neprivaloma asmeninė žinutė" send_invite_email: "Išsaugoti ir siųsti el. laišką" save_invite: "Išsaugoti kvietimą" invite_saved: "Kvietimas išsaugotas." - invite_copied: "Kvietimo nuoroda nukopijuota." bulk_invite: text: "Masinis kvietimas" progress: "Įkelta %{progress}%..." @@ -1933,6 +1930,9 @@ lt: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - baigtas" + dismiss_confirmation: + dismiss: "Praleisti" + cancel: "Atšaukti" group_message_summary: one: "%{count} žinutė, jūsų %{group_name}pato dėžutėje" few: "%{count} žinutės, jūsų %{group_name}pato dėžutėje" @@ -2017,6 +2017,7 @@ lt: in_topics_posts: "visose temose ir žinutėse" enter_hint: "arba paspauskite Enter" in_posts_by: "pranešimuose %{username}" + browser_tip: "%{modifier} + f" type: default: "Temos/įrašai" users: "Nariai" @@ -3580,6 +3581,8 @@ lt: wordpress: Būtinas, kad „WordPress“ wp-diskurso papildinys veiktų. posts: edit: Redaguoti bet kokį įrašą arba konkretų. + uploads: + create: Įkelti naują failą. users: bookmarks: Sąrašas vartotojo žymių. Naudojant ICS formatą, jis grąžina priminimus apie žymes. show: Gauti informaciją apie vartotoją. diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml index 4bbf3b2bf1..92489ad715 100644 --- a/config/locales/client.lv.yml +++ b/config/locales/client.lv.yml @@ -1370,22 +1370,19 @@ lv: invite: new_title: "Izveidot ielūgumu" edit_title: "Rediģēt uzaicinājumu" - instructions: "Kopīgojiet šo saiti, lai uzreiz piešķirtu piekļuvi šai vietnei" + instructions: "Kopīgojiet šo saiti, lai uzreiz piešķirtu piekļuvi šai vietnei:" copy_link: "kopēt saiti" expires_in_time: "Derīguma termiņš beidzas pēc %{time}" expired_at_time: "Derīguma termiņš beidzas pēc %{time}" show_advanced: "Rādīt papildu opcijas" hide_advanced: "Slēpt papildu opcijas" - restrict_email: "Ierobežot tikai vienu e -pasta adresi" max_redemptions_allowed: "Maksimāli izmantojams" add_to_groups: "Pievienot grupām" - invite_to_topic: "Ierasties pie šīs tēmas" expires_at: "Derīguma termiņš beidzas" custom_message: "Neobligāts personiskais ziņojums" send_invite_email: "Saglabāt un nosūtīt e -pastu" save_invite: "Saglabāt uzaicinājumu" invite_saved: "Uzaicinājums saglabāts." - invite_copied: "Uzaicinājuma saite ir nokopēta." bulk_invite: progress: "Augšupielādēts %{progress}%..." success: "Fails veiksmīgi lejuplādēts, jums paziņos, kad process beidzies." @@ -1799,6 +1796,9 @@ lv: title: "paziņojumi par @vārda pieminēšanu, atbildēm uz jūsu ierakstiem un tēmām, ziņām, utt." none: "Pašlaik neizdodas ielādēt paziņojumus." empty: "Nav atrasti paziņojumi." + dismiss_confirmation: + dismiss: "Nerādīt" + cancel: "Atcelt" popup: mentioned: '%{username} pieminēja jūs "%{topic}" - %{site_title}' group_mentioned: '%{username} pieminēja jūs "%{topic}" - %{site_title}' diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 056d6a85eb..8c0a819de9 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -1438,22 +1438,19 @@ nb_NO: invite: new_title: "Opprett invitasjon" edit_title: "Rediger invitasjon" - instructions: "Del denne lenken for å gi tilgang til dette nettstedet umiddelbart" + instructions: "Del denne lenken for å gi tilgang til dette nettstedet umiddelbart:" copy_link: "kopier link" expires_in_time: "Utløper om %{time}" expired_at_time: "Utløpt kl. %{time}" show_advanced: "Vis avanserte innstillinger" hide_advanced: "Skjul avanserte alternativer" - restrict_email: "Begrens til en e-postadresse" max_redemptions_allowed: "Maks antall bruk" add_to_groups: "Legg til i grupper" - invite_to_topic: "Kom til dette emnet" expires_at: "Utløper etter" custom_message: "Valgfri personlig melding" send_invite_email: "Lagre og send e-post" save_invite: "Lagre invitasjon" invite_saved: "Invitasjon lagret." - invite_copied: "Invitasjonslenken er kopiert." bulk_invite: none: "Ingen invitasjoner til å vise på denne siden." text: "Bulk invitasjon" @@ -2008,6 +2005,9 @@ nb_NO: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - fullført" + dismiss_confirmation: + dismiss: "Avslå" + cancel: "Avbryt" group_message_summary: one: "%{count} melding i din %{group_name} innboks" other: "%{count} meldinger i din innboks for %{group_name}" diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index cdf5553153..4806fd5909 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -1439,7 +1439,7 @@ nl: invite: new_title: "Uitnodiging maken" edit_title: "Uitnodiging bewerken" - instructions: "Deze koppeling delen om meteen toegang tot deze website te verlenen" + instructions: "Deze koppeling delen om meteen toegang tot deze website te verlenen:" copy_link: "koppeling kopiëren" show_advanced: "Geavanceerde opties tonen" hide_advanced: "Geavanceerde opties verbergen" @@ -1449,7 +1449,6 @@ nl: send_invite_email: "E-mail opslaan en versturen" save_invite: "Uitnodiging opslaan" invite_saved: "Uitnodiging opgeslagen." - invite_copied: "Uitnodigingskoppeling gekopieerd." bulk_invite: none: "Geen uitnodigingen om weer te geven op deze pagina." text: "Bulkuitnodiging" @@ -2031,6 +2030,9 @@ nl: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - voltooid" + dismiss_confirmation: + dismiss: "Negeren" + cancel: "Annuleren" group_message_summary: one: "%{count} bericht in uw Postvak IN voor %{group_name}" other: "%{count} berichten in uw Postvak IN voor %{group_name}" diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 54937a5ae7..36b6e341b1 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -43,7 +43,7 @@ pl_PL: long_date_without_year_with_linebreak: "D MMM
LT" long_date_with_year_with_linebreak: "D MMM 'YY
LT" wrap_ago: "%{date} temu" - wrap_on: "na %{date}" + wrap_on: "%{date}" tiny: half_a_minute: "< 1m" less_than_x_seconds: @@ -1589,22 +1589,19 @@ pl_PL: invite: new_title: "Utwórz zaproszenie" edit_title: "Edytuj zaproszenie" - instructions: "Udostępnij ten link, aby natychmiast przyznać dostęp do tej witryny" + instructions: "Udostępnij ten link, aby natychmiast przyznać dostęp do tej witryny:" copy_link: "skopiuj link" expires_in_time: "Wygasa za %{time}" expired_at_time: "Wygasło o %{time}" show_advanced: "Pokaż ustawienia zaawansowane" hide_advanced: "Ukryj ustawienia zaawansowane" - restrict_email: "Ogranicz do jednego adresu e-mail" max_redemptions_allowed: "Maksymalna liczba użyć" add_to_groups: "Dodaj do grup" - invite_to_topic: "Przyjedź pod ten temat" expires_at: "Wygasa po" custom_message: "Opcjonalna wiadomość osobista" send_invite_email: "Zapisz i wyślij e-mail" save_invite: "Zapisz zaproszenie" invite_saved: "Zaproszenie zapisane." - invite_copied: "Link z zaproszeniem został skopiowany." bulk_invite: none: "Brak zaproszeń do wyświetlenia na tej stronie." text: "Zaproszenie zbiorcze" @@ -2253,6 +2250,9 @@ pl_PL: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - zakończone" + dismiss_confirmation: + dismiss: "Odrzuć" + cancel: "Anuluj" group_message_summary: one: "%{count} wiadomość w skrzynce odbiorczej %{group_name}" few: "%{count} wiadomości w skrzynce odbiorczej %{group_name}" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 4ee705cc44..4980f174de 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -1103,6 +1103,7 @@ pt: rejected_posts: "mensagens rejeitadas" messages: inbox: "Caixa de Entrada" + personal: "Pessoal" latest: "Recentes" sent: "Enviado" unread: "Não Lido" @@ -1451,22 +1452,19 @@ pt: invite: new_title: "Criar Convite" edit_title: "Editar Convite" - instructions: "Compartilhe este link para conceder acesso instantâneo a este site" + instructions: "Compartilhe este link para conceder acesso instantâneo a este site:" copy_link: "copiar link" expires_in_time: "Expira em %{time}" expired_at_time: "Expirou em %{time}" show_advanced: "Mostrar Opções Avançadas" hide_advanced: "Ocultar Opções Avançadas" - restrict_email: "Restringir a um endereço de e-mail" max_redemptions_allowed: "Máximo de utilizações" add_to_groups: "Adicionar aos grupos" - invite_to_topic: "Chegue neste tópico" expires_at: "Expira após" custom_message: "Mensagem pessoal opcional" send_invite_email: "Guardar e Enviar E-mail" save_invite: "Salvar Convite" invite_saved: "Convite salvo." - invite_copied: "Link de convite copiado." bulk_invite: none: "Sem convites para exibir nesta página." text: "Convite em massa" @@ -1614,6 +1612,7 @@ pt: enabled_description: "Está a ver um resumo deste tópico: as respostas mais interessantes são determinadas pela comunidade." enable: "Resumir Este Tópico" disable: "Mostrar Todas As Publicações" + short_label: "Resumir" deleted_filter: enabled_description: "Este tópico contém respostas eliminadas, que foram ocultadas." disabled_description: "As publicações eliminadas no tópico são exibidas." @@ -2008,6 +2007,9 @@ pt: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - concluído" + dismiss_confirmation: + dismiss: "Marcar como visto" + cancel: "Cancelar" group_message_summary: one: "%{count} mensagem no seu grupo %{group_name}" other: "%{count} mensagens no seu grupo %{group_name}" @@ -2063,6 +2065,8 @@ pt: select_all: "Selecionar Tudo" clear_all: "Limpar Tudo" too_short: "O seu termo de pesquisa é muito curto." + open_advanced: "Abrir pesquisa avançada" + clear_search: "Limpar pesquisa" result_count: one: "%{count} resultado para%{term}" other: "%{count}%{plus} resultados para%{term}" @@ -2081,6 +2085,7 @@ pt: search_button: "Pesquisar" categories: "Categorias" tags: "Etiquetas" + in_this_topic: "neste tópico" type: users: "Utilizadores" categories: "Categorias" @@ -2091,6 +2096,7 @@ pt: topic: "Pesquisar este tópico" private_messages: "Pesquisar mensagens" advanced: + title: Filtros avançados posted_by: label: Publicado por in_category: @@ -2177,6 +2183,7 @@ pt: close_topics: "Fechar Tópicos" archive_topics: "Arquivar tópicos" move_messages_to_inbox: "Mover para a Caixa de Entrada" + notification_level: "Notificações..." change_notification_level: "Alterar Nível de Notificação" choose_new_category: "Escolha a nova categoria para os tópicos:" selected: @@ -2916,6 +2923,7 @@ pt: position_disabled_click: 'ative a definição "categoria em posição fixa".' parent: "Categoria Principal" notifications: + title: "alterar o nível de notificação desta categoria" watching: title: "A vigiar" watching_first_post: @@ -3261,6 +3269,7 @@ pt: favorite_count: "%{count}/%{max} emblemas marcado como favorito" download_calendar: download: "Transferir" + add_to_calendar: "Adicionar ao calendário" tagging: all_tags: "Todas as Etiquetas" other_tags: "Outras Tags" @@ -3283,6 +3292,7 @@ pt: edit_synonyms: "Gerenciar Sinônimos" add_synonyms_label: "Adicionar sinônimos:" add_synonyms: "Adicionar" + remove_synonym: "Remover Sinônimo" delete_tag: "Remover Etiqueta" delete_confirm: one: "Tem certeza que deseja excluir esta tag e removê-la de %{count} tópico ao qual ela está atribuída?" @@ -3497,15 +3507,25 @@ pt: no_data: "Sem dados para exibir." trending_search: more: 'Pesquisar logs' + average_chart_label: Média filters: group: label: Grupo category: label: Categoria + include_subcategories: + label: "Incluir Subcategorias" groups: new: title: "Novo Grupo" create: "Criar" + name: + too_short: "O nome do grupo é demasiado curto" + too_long: "O nome do grupo é demasiado longo" + checking: "A verificar a disponibilidade do nome de grupo..." + available: "O nome de grupo está disponível" + not_available: "O nome de grupo não está disponível" + blank: "O nome de grupo não pode ficar em branco" manage: interaction: email: E-mail @@ -3544,6 +3564,7 @@ pt: delete: "Eliminar" delete_confirm: "Eliminar este grupo?" delete_failed: "Impossível eliminar grupo. Se se trata de um grupo automático, não pode ser eliminado." + delete_automatic_group: Este é um grupo automático e não pode ser apagado. delete_owner_confirm: "Remover privilégios do proprietário para '%{username}'?" add: "Adicionar" custom: "Personalizar" @@ -3552,6 +3573,8 @@ pt: default_title_description: "será aplicado a todos os usuários do grupo" group_owners: Proprietários add_owners: Adicionar proprietários + none_selected: "Selecione um grupo para começar" + no_custom_groups: "Criar um novo grupo personalizado" api: generate_master: "Gerar Chave Mestra API " none: "Não existem chaves API ativas neste momento." @@ -3588,6 +3611,7 @@ pt: Ao usar escopos, você pode restringir uma chave de API a um conjunto específico de endpoints. Você também pode definir quais parâmetros serão permitidos. Use vírgulas para separar valores múltiplos. title: Escopos + global: Global resource: Recurso action: Ação allowed_parameters: Parâmetros Permitidos @@ -3598,6 +3622,8 @@ pt: topics: read: Ler um tópico ou um post específico nele. RSS também é suportado. write: Criar um novo tópico ou poste em um já existente. + users: + show: Obter informações sobre um utilizador. web_hooks: title: "Webhooks" none: "Não existem webhooks neste momento." diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index 395b07124e..db9f6b5479 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -1459,22 +1459,19 @@ pt_BR: invite: new_title: "Criar convite" edit_title: "Editar convite" - instructions: "Compartilhar este link para conceder acesso imediato ao site" + instructions: "Compartilhar este link para conceder acesso imediato ao site:" copy_link: "copiar link" expires_in_time: "Expira em %{time}" expired_at_time: "Expirou em %{time}" show_advanced: "Exibir opções avançadas" hide_advanced: "Ocultar opções avançadas" - restrict_email: "Restringir a um endereço de e-mail" max_redemptions_allowed: "Máximo de usos" add_to_groups: "Adicionar a grupos" - invite_to_topic: "Buscar tópico" expires_at: "Expira após" custom_message: "Mensagem pessoal opcional" send_invite_email: "Salvar e enviar e-mail" save_invite: "Salvar convite" invite_saved: "Convite salvo" - invite_copied: "Link de convite copiado" bulk_invite: none: "Nenhum convite para exibir nesta página." text: "Convite em massa" @@ -2050,6 +2047,9 @@ pt_BR: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - concluído(a)" + dismiss_confirmation: + dismiss: "Descartar" + cancel: "Cancelar" group_message_summary: one: "%{count} mensagem na caixa de entrada de %{group_name}" other: "%{count} mensagens na caixa de entrada de %{group_name}" diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index 124d063742..5567559527 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -1684,6 +1684,9 @@ ro: watching_first_post: "Subiect nou %{description}" reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" + dismiss_confirmation: + dismiss: "Înlătură" + cancel: "Anulează" popup: mentioned: '%{username} te-a menţionat în "%{topic}" - %{site_title}' group_mentioned: '%{username} te-a menţionat în "%{topic}" - %{site_title}' diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 1ce6916946..f911b3db1a 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -1592,22 +1592,22 @@ ru: invite: new_title: "Создать приглашение" edit_title: "Изменить приглашение" - instructions: "Поделитесь указанной здесь ссылкой, чтобы предоставить доступ к этому сайту" + instructions: "Поделитесь указанной здесь ссылкой, чтобы предоставить доступ к этому сайту:" copy_link: "Скопировать ссылку" expires_in_time: "Срок действия ссылки истечёт через %{time}" expired_at_time: "Срок действия ссылки истёк %{time}" show_advanced: "Показать дополнительные параметры" hide_advanced: "Скрыть дополнительные параметры" - restrict_email: "Ограничить одним адресом электронной почты" + restrict_email: "Ограничиться адресом электронной почты" max_redemptions_allowed: "Максимальное количество использований ссылки" add_to_groups: "Добавить приглашённых в группы" - invite_to_topic: "После перехода на сайт открыть эту тему" + invite_to_topic: "После перехода на сайт открыть тему" expires_at: "Срок действия приглашения истечёт после" custom_message: "Необязательное личное сообщение" send_invite_email: "Сохранить и отправить приглашение" + send_invite_email_instructions: "Ограничиться адресом электронной почты для отправки приглашения" save_invite: "Сохранить приглашение" invite_saved: "Приглашение сохранено." - invite_copied: "Ссылка на приглашение скопирована." bulk_invite: none: "Нет приглашений для отображения на этой странице." text: "Массовое приглашение" @@ -2256,6 +2256,14 @@ ru: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - завершено" + dismiss_confirmation: + body: + one: "Вы уверены? У вас %{count} важное уведомление." + few: "Вы уверены? У вас %{count} важных уведомления." + many: "Вы уверены? У вас %{count} важных уведомлений." + other: "Вы уверены? У вас есть %{count} важных уведомлений." + dismiss: "Пометить прочитанными" + cancel: "Нет" group_message_summary: one: "%{count} сообщение в вашей группе %{group_name}" few: "%{count} сообщения в вашей группе %{group_name}" @@ -2343,6 +2351,8 @@ ru: in_topics_posts: "Во всех темах и сообщениях" enter_hint: "Или нажмите Enter" in_posts_by: "В сообщениях от %{username}" + browser_tip: "%{modifier} + f" + browser_tip_description: "Использовать поисковый движок браузера" type: default: "По темам и сообщениям" users: "По пользователям" @@ -2355,10 +2365,10 @@ ru: topic: "Искать в этой теме" private_messages: "Искать в личных сообщениях" tips: - category_tag: "фильтры по разделам или тегам" - author: "фильтры по автору сообщения" - in: "фильтры по метаданным (например, in:title, in:personal, in:pinned)" - status: "фильтры по статусу темы" + category_tag: "Фильтр по разделам или тегам" + author: "Фильтр по автору сообщения" + in: "Фильтр по метаданным (например, in:title, in:personal, in:pinned)" + status: "Фильтр по статусу темы" full_search: "Запуск поиска по всей странице" full_search_key: "%{modifier} + Enter" advanced: @@ -2423,7 +2433,7 @@ ru: placeholder: максимум aria_label: Фильтр по максимальному количеству просмотров additional_options: - label: "Фильтр по количеству сообщений и просмотрам тем" + label: "Фильтр по количеству сообщений и просмотров тем" hamburger_menu: "системное меню" new_item: "новый" go_back: "вернуться" @@ -2787,6 +2797,11 @@ ru: help: "Поделиться ссылкой на тему" instructions: "Поделиться ссылкой на тему:" copied: "Ссылка на тему скопирована." + restricted_groups: + one: "Тема видна только участникам группы %{groupNames}" + few: "Тема видна только участникам групп: %{groupNames}" + many: "Тема видна только участникам групп: %{groupNames}" + other: "Тема видна только участникам групп: %{groupNames}" notify_users: title: "Уведомить" instructions: "Уведомить следующих пользователей об этой теме:" @@ -3701,6 +3716,7 @@ ru: title: "Меню результатов поиска" prev_next: "%{shortcut} Перемещение по результатам поиска" insert_url: "%{shortcut} Вставить ссылку на найденное сообщение в окно открытого редактора" + full_page_search: "%{shortcut} Запустить поиск по всей странице" badges: earned_n_times: one: "Заработал эту награду %{count} раз" @@ -4176,6 +4192,8 @@ ru: wordpress: Работа плагина WordPress wp-discourse. posts: edit: Редактирование сообщения. + uploads: + create: Загрузка нового файла. users: bookmarks: Список закладок пользователя. Возвращает напоминания о закладках при использовании формата ICS. sync_sso: Синхронизация пользователя с помощью DiscourseConnect. diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml index 47f5da78be..71dbd14d39 100644 --- a/config/locales/client.sk.yml +++ b/config/locales/client.sk.yml @@ -1344,6 +1344,9 @@ sk: title: "oznámenia o zmienkach pomocou @meno, odpovede na Vaše príspevky a témy, správy, atď." none: "Notifikácie sa nepodarilo načítať" empty: "Žiadne upozornenia sa nenašli." + dismiss_confirmation: + dismiss: "Zahodiť" + cancel: "Zrušiť" popup: mentioned: '%{username} Vás zmienil v "%{topic}" - %{site_title}' group_mentioned: '%{username} Vás zmienil v "%{topic}" - %{site_title}' diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml index 1360a97b7f..b639c23777 100644 --- a/config/locales/client.sl.yml +++ b/config/locales/client.sl.yml @@ -1427,7 +1427,7 @@ sl: expires_at: "Kdaj bo ta povezava povabila potekla?" invite: new_title: "Ustvari povabilo" - instructions: "Delite to povezavo in takoj omogočite dostop do te strani" + instructions: "Delite to povezavo in takoj omogočite dostop do te strani:" show_advanced: "Pokaži dodatne možnosti" add_to_groups: "Dodaj v skupine" expires_at: "Poteče po" @@ -1983,6 +1983,9 @@ sl: membership_request_accepted: "Sprejeti v članstvo v '%{group_name}'" reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" + dismiss_confirmation: + dismiss: "Opusti" + cancel: "Prekliči" group_message_summary: one: "%{count} sporočilo v%{group_name} predalu" two: "%{count} sporočili v %{group_name} predalu" diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index dbcc6c97e2..0925318e22 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -1092,6 +1092,9 @@ sq: title: "njoftimet për përmendjet @emri, përgjigjet ndaj postime dhe temave, mesazhet, etj." none: "Nuk i hapëm dot njoftimet." empty: "Nuk u gjet asnjë njoftim. " + dismiss_confirmation: + dismiss: "Hiqe" + cancel: "Anulo" popup: mentioned: '%{username} ju përmendi në "%{topic}" - %{site_title}' group_mentioned: '%{username} ju përmendi në "%{topic}" - %{site_title}' diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml index 716f42a664..73da9a39d3 100644 --- a/config/locales/client.sr.yml +++ b/config/locales/client.sr.yml @@ -1129,6 +1129,9 @@ sr: notifications: none: "Nemoguće je učitati notifikacije ovog trenutka." empty: "Nisu pronađene notifikacije" + dismiss_confirmation: + dismiss: "Одбаци" + cancel: "Odustani" titles: watching_first_post: "nova tema" upload_selector: diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 29328c91b0..392d89517e 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -1478,22 +1478,22 @@ sv: invite: new_title: "Skapa inbjudan" edit_title: "Redigera inbjudan" - instructions: "Dela denna länk för att omedelbart bevilja åtkomst till denna webbplats" + instructions: "Dela denna länk för att omedelbart bevilja åtkomst till denna webbplats:" copy_link: "kopiera länk" expires_in_time: "Utgår om %{time}" expired_at_time: "Utgår kl. %{time}" show_advanced: "Visa avancerade alternativ" hide_advanced: "Dölj avancerade alternativ" - restrict_email: "Begränsa till en enda e-postadress" + restrict_email: "Begränsa till e-post" max_redemptions_allowed: "Max antal användningar" add_to_groups: "Lägg till i grupper" - invite_to_topic: "Kom fram till detta ämne" + invite_to_topic: "Anländ till ämne" expires_at: "Förfaller efter" custom_message: "Valfritt personligt meddelande" send_invite_email: "Spara och skicka e-post" + send_invite_email_instructions: "Begränsa inbjudan till e-post för att skicka ett inbjudningsmeddelande" save_invite: "Spara inbjudan" invite_saved: "Inbjudan har sparats." - invite_copied: "Inbjudningslänken har kopierats." bulk_invite: none: "Inga inbjudningar att visa på denna sida." text: "Massinbjudan" @@ -2084,6 +2084,12 @@ sv: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2}%{description}" votes_released: "%{description} - slutförd" + dismiss_confirmation: + body: + one: "Är du säker? Du har %{count} viktig avisering." + other: "Är du säker? Du har %{count} viktiga aviseringar." + dismiss: "Avfärda" + cancel: "Avbryt" group_message_summary: one: "%{count} meddelande i din %{group_name}-inkorg" other: "%{count} meddelanden i din %{group_name}-inkorg" @@ -2167,6 +2173,8 @@ sv: in_topics_posts: "i alla ämnen och inlägg" enter_hint: "eller tryck Enter" in_posts_by: "i inlägg av %{username}" + browser_tip: "%{modifier} + f" + browser_tip_description: "igen för att använda inbyggd webbläsarsökning" type: default: "Ämnen/inlägg" users: "Användare" @@ -2583,6 +2591,9 @@ sv: help: "dela en länk till detta ämne" instructions: "Dela en länk till detta ämne:" copied: "Ämneslänken har kopierats." + restricted_groups: + one: "Endast synligt för medlemmar i grupp: %{groupNames}" + other: "Endast synligt för medlemmar i grupperna: %{groupNames}" notify_users: title: "Avisera" instructions: "Avisera följande användare om det här ämnet:" @@ -3411,6 +3422,7 @@ sv: title: "Sökmeny" prev_next: "%{shortcut} Flytta markering upp eller ner" insert_url: "%{shortcut} Infoga urval i öppen redigerare" + full_page_search: "%{shortcut} Startar helsidessökning" badges: earned_n_times: one: "Förtjänade den här utmärkelsen %{count} gång" @@ -3856,6 +3868,8 @@ sv: wordpress: Nödvändigt för att WordPress-tillägget wp-discourse ska fungera. posts: edit: Redigera ett inlägg eller ett specifikt inlägg. + uploads: + create: Ladda upp en ny fil. users: bookmarks: Lista användarbokmärken. Det returnerar bokmärkespåminnelser när ICS-formatet används. sync_sso: Synkronisera en användare med DiscourseConnect. diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml index 511182703f..f2bb6ba08a 100644 --- a/config/locales/client.sw.yml +++ b/config/locales/client.sw.yml @@ -1326,6 +1326,9 @@ sw: topic_reminder: "%{jina la mtumiaji} %{maelezo}" watching_first_post: "Mada Mpya %{maelezo}" reaction_2: "%{username}, %{username2} %{description}" + dismiss_confirmation: + dismiss: "Ondosha" + cancel: "Ghairi" group_message_summary: one: "Kuna meseji %{count} kwenye %{group_name} inbox" other: "kuna meseji %{count} kwenye %{group_name} inbox" diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml index 1280899a99..3f8a85a492 100644 --- a/config/locales/client.te.yml +++ b/config/locales/client.te.yml @@ -773,6 +773,8 @@ te: label: "కొత్త విషయం" notifications: none: "ఈ సమయంలో ప్రకటనలు చూపలేకున్నాము." + dismiss_confirmation: + cancel: "రద్దుచేయి" titles: watching_first_post: "కొత్త విషయం" upload_selector: diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml index 132e058ab1..6bd01f0e5e 100644 --- a/config/locales/client.th.yml +++ b/config/locales/client.th.yml @@ -1462,6 +1462,9 @@ th: membership_request_accepted: "ถูกรับเป็นสมาชิกในกลุ่ม '%{group_name}'" reaction: "%{username}%{description}" reaction_2: "%{username}, %{username2}%{description}" + dismiss_confirmation: + dismiss: "ซ่อน" + cancel: "ยกเลิก" group_message_summary: other: "%{count}ข้อความในกล่องขาเข้าของกลุ่ม %{group_name}" popup: diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 38a8b74bd1..982fea2af0 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -1474,22 +1474,19 @@ tr_TR: invite: new_title: "Davet oluştur" edit_title: "Daveti düzenle" - instructions: "Bu siteye anında erişim vermek için bu bağlantıyı paylaşın" + instructions: "Bu siteye anında erişim vermek için bu bağlantıyı paylaşın:" copy_link: "bağlantıyı kopyala" expires_in_time: "Süresi %{time} içinde dolacak:" expired_at_time: "Şu zamanda süresi doldu: %{time}" show_advanced: "Gelişmiş Seçenekleri Göster" hide_advanced: "Gelişmiş Seçenekleri Gizle" - restrict_email: "Bir e-posta adresiyle sınırla" max_redemptions_allowed: "Maksimum kullanım" add_to_groups: "Gruplara ekle" - invite_to_topic: "Bu konuya gelin" expires_at: "Geçerliliğini yitireceği zaman" custom_message: "İsteğe bağlı kişisel mesaj" send_invite_email: "Kaydet ve Gönder" save_invite: "Daveti Kaydet" invite_saved: "Davet kaydedildi." - invite_copied: "Davet bağlantısı kopyalandı." bulk_invite: none: "Bu sayfada görüntülenecek davetiye yok." text: "Toplu Davet" @@ -2077,6 +2074,9 @@ tr_TR: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - tamamlandı" + dismiss_confirmation: + dismiss: "Kapat" + cancel: "İptal" group_message_summary: one: "%{group_name} gelen kutunuzdaki %{count} mesaj var" other: "%{group_name} gelen kutunuzda %{count} mesajları" diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml index 628ab7351e..77fee7d905 100644 --- a/config/locales/client.uk.yml +++ b/config/locales/client.uk.yml @@ -1583,22 +1583,19 @@ uk: invite: new_title: "Створити запрошення" edit_title: "Редагувати запрошення" - instructions: "Поділіться цим посиланням для миттєвого надання доступу до цього сайту" + instructions: "Поділіться цим посиланням для миттєвого надання доступу до цього сайту:" copy_link: "копіювати посилання" expires_in_time: "Термін дії мине через %{time}" expired_at_time: "Термін дії минув о %{time}" show_advanced: "Показати додаткові параметри" hide_advanced: "Сховати додаткові параметри" - restrict_email: "Обмежити однією адресою електронної пошти" max_redemptions_allowed: "Максимальна кількість використань" add_to_groups: "Додати до груп" - invite_to_topic: "Перейти до цієї теми" expires_at: "Завершується після" custom_message: "Необов’язкове особисте повідомлення" send_invite_email: "Зберегти та надіслати Email" save_invite: "Зберегти запрошення" invite_saved: "Запрошення збережено." - invite_copied: "Посилання на запрошення скопійовано." bulk_invite: none: "Немає запрошень для відображення на цій сторінці." text: "Масове запрошення" @@ -2245,6 +2242,9 @@ uk: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - завершено" + dismiss_confirmation: + dismiss: "Відкинути" + cancel: "Скасувати" group_message_summary: one: "%{count} повідомлення в вашій групі: %{group_name} " few: "%{count} повідомлень в вашій групі: %{group_name} " diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml index ceaec164a6..dfc1ee5647 100644 --- a/config/locales/client.ur.yml +++ b/config/locales/client.ur.yml @@ -1835,6 +1835,9 @@ ur: other: "%{group_name}' کے %{count} کھلی رکنیت کی درخواستیں" reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" + dismiss_confirmation: + dismiss: "بر خاست کریں" + cancel: "منسوخ" group_message_summary: one: "آپ کے %{group_name} اِن باکس میں %{count} پیغام" other: "آپ کے %{group_name} اِن باکس میں %{count} پیغامات" diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml index bceb1127e2..313c59c2a4 100644 --- a/config/locales/client.vi.yml +++ b/config/locales/client.vi.yml @@ -1347,22 +1347,19 @@ vi: invite: new_title: "Tạo lời mời" edit_title: "Chỉnh sửa lời mời" - instructions: "Chia sẻ liên kết này để cấp quyền truy cập ngay lập tức vào trang web này" + instructions: "Chia sẻ liên kết này để cấp quyền truy cập ngay lập tức vào trang web này:" copy_link: "sao chép liên kết" expires_in_time: "Hết hạn trong %{time}" expired_at_time: "Đã hết hạn vào lúc %{time}" show_advanced: "Hiển thị các tùy chọn nâng cao" hide_advanced: "Ẩn các tùy chọn nâng cao" - restrict_email: "Giới hạn đến một địa chỉ email" max_redemptions_allowed: "Sử dụng tối đa" add_to_groups: "Thêm vào nhóm" - invite_to_topic: "Đến chủ đề này" expires_at: "Hết hạn sau" custom_message: "Tin nhắn cá nhân tùy chọn" send_invite_email: "Lưu và Gửi Email" save_invite: "Lưu lời mời" invite_saved: "Đã lưu lời mời." - invite_copied: "Đã sao chép liên kết mời." bulk_invite: none: "Không có lời mời để hiển thị trên trang này." text: "Mời hàng loạt" @@ -1898,6 +1895,9 @@ vi: reaction: "%{username} %{description}" reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} - hoàn thành" + dismiss_confirmation: + dismiss: "Hủy bỏ" + cancel: "Hủy" group_message_summary: other: "%{count} thư trong %{group_name} hộp thư đến của bạn" popup: diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index e80e7a8fb3..c5335f149b 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -257,6 +257,7 @@ zh_CN: bookmarks: created: "您已将此帖子加入书签。%{name}" not_bookmarked: "将此帖子加入书签" + remove_reminder_keep_bookmark: "删除提醒并保留书签" created_with_reminder: "您已将此帖子加入书签，并于 %{date}设置了一个提醒。%{name}" remove: "移除书签" delete: "删除书签" @@ -1089,6 +1090,7 @@ zh_CN: tags: "标签" warnings: "官方警告" read_more_in_group: "想阅读更多？浏览%{groupLink}或中的其他话题。" + read_more: "想阅读更多内容？ 请在 个人私信中浏览其他消息。" preferences_nav: account: "帐户" security: "安全性" @@ -1417,22 +1419,19 @@ zh_CN: invite: new_title: "创建邀请" edit_title: "编辑邀请" - instructions: "分享此链接可立即授予访问此站点的权限" + instructions: "分享此链接可立即授予访问此站点的权限：" copy_link: "复制链接" expires_in_time: "于 %{time}过期" expired_at_time: "过期时间为 %{time}" show_advanced: "显示高级选项" hide_advanced: "隐藏高级选项" - restrict_email: "限制为一个电子邮件地址" max_redemptions_allowed: "最大使用次数" add_to_groups: "添加到群组" - invite_to_topic: "到达此话题" expires_at: "过期时间" custom_message: "可选个人信息" send_invite_email: "保存并发送电子邮件" save_invite: "保存邀请" invite_saved: "邀请已保存。" - invite_copied: "邀请链接已复制。" bulk_invite: none: "此页面没有要显示的邀请。" text: "批量邀请" @@ -1860,6 +1859,7 @@ zh_CN: create_whisper: "密语" create_shared_draft: "创建共享草稿" edit_shared_draft: "编辑共享草稿" + title: "或按 %{modifier}Enter" users_placeholder: "添加用户" title_placeholder: "用一句话概括讨论内容…" title_or_link_placeholder: "输入标题，或在此处粘贴链接" @@ -1949,6 +1949,8 @@ zh_CN: desc: "回复但不更改最新回复日期" reload: "重新加载" ignore: "忽略" + image_alt_text: + aria_label: 替代图片的文字 notifications: tooltip: regular: @@ -1991,6 +1993,9 @@ zh_CN: reaction: "%{username} %{description}" reaction_2: "%{username}、%{username2} %{description}" votes_released: "%{description} - 已完成" + dismiss_confirmation: + dismiss: "关闭" + cancel: "取消" group_message_summary: other: "您的 %{group_name} 收件箱中有 %{count} 条消息" popup: @@ -2045,6 +2050,8 @@ zh_CN: select_all: "全选" clear_all: "全部清除" too_short: "您的搜索词过短。" + open_advanced: "打开高级搜索" + clear_search: "清除搜索内容" sort_or_bulk_actions: "分类或者从结果中批量选择" result_count: other: "%{count}%{plus} 条与 “%{term}”有关的结果" @@ -2064,7 +2071,14 @@ zh_CN: search_term_label: "输入搜索关键字" categories: "类别" tags: "标签" + in: "在" + in_this_topic: "在此主题中" + in_this_topic_tooltip: "切换到搜索所有主题" + in_topics_posts: "在所有主题和帖子中" + enter_hint: "或按 Enter" + in_posts_by: "搜索 @%{username} 的帖子" type: + default: "主题/帖子" users: "用户" categories: "类别" categories_and_tags: "分类/标签" @@ -2074,6 +2088,13 @@ zh_CN: tag: "搜索 #%{tag} 标签" topic: "搜索此话题" private_messages: "搜索消息" + tips: + category_tag: "按类别或标签筛选" + author: "按帖子作者筛选" + in: "按元数据进行筛选(例如：标题、个人、置顶)" + status: "按主题状态筛选" + full_search: "启动完整页面搜索" + full_search_key: "%{modifier} + 回车" advanced: title: 高级过滤器 posted_by: @@ -2118,8 +2139,10 @@ zh_CN: label: 帖子 min: placeholder: 最小值 + aria_label: 按帖子的最大数量筛选 max: placeholder: 最大值 + aria_label: 按帖子的最大数量筛选 time: label: 发布时间 aria_label: 按发布日期过滤 @@ -2129,8 +2152,12 @@ zh_CN: label: 浏览量 min_views: placeholder: 最小值 + aria_label: 按最大观看次数筛选 max_views: placeholder: 最大值 + aria_label: 按最大观看次数筛选 + additional_options: + label: "按帖子数量和主题浏览量筛选" hamburger_menu: "菜单" new_item: "新" go_back: "返回" @@ -2297,6 +2324,7 @@ zh_CN: time_frame_required: "请选择时间范围" min_duration: "持续时间必须大于 0" max_duration: "持续时间必须小于 20 年" + duration: "持续时间：" auto_update_input: none: "选择时间范围" now: "现在" @@ -2616,7 +2644,9 @@ zh_CN: deleted_by_author_simple: "（话题已被作者删除）" post: quote_reply: "引用" + quote_reply_shortcut: "或者按 q" quote_edit: "编辑" + quote_edit_shortcut: "或按 e" quote_share: "分享" edit_reason: "原因：" post_number: "帖子 %{number}" @@ -2659,6 +2689,7 @@ zh_CN: edit: "抱歉，编辑您的帖子时出错。请重试。" upload: "抱歉，上传该文件时出错。请重试。" file_too_large: "抱歉，该文件太大（最大大小为 %{max_size_kb}KB）。为什么不将您的大文件上传到云共享服务，然后粘贴链接呢？" + file_too_large_humanized: "抱歉，该文件太大（最大大小为 %{max_size}KB）。为什么不将您的大文件上传到云共享服务，然后粘贴链接呢？" too_many_uploads: "抱歉，一次只能上传一个文件。" too_many_dragged_and_dropped_files: other: "抱歉，一次只能上传 %{count} 个文件。" @@ -2700,6 +2731,7 @@ zh_CN: just_the_post: "否，仅删除此帖子" admin: "帖子管理员操作" permanently_delete: "永久删除" + permanently_delete_confirmation: "你确定要永久删除此帖子吗？你将无法恢复它。" wiki: "设为 Wiki" unwiki: "移除 Wiki" convert_to_moderator: "添加管理人员颜色" @@ -2908,6 +2940,7 @@ zh_CN: num_auto_bump_daily: "每天自动顶贴的开放话题的数量：" navigate_to_first_post_after_read: "阅读话题后导航到第一个帖子" notifications: + title: "更改此分类的通知级别" watching: title: "关注" description: "您将自动关注此类别中的所有话题。您会收到每个话题中每个新帖子的通知，并且会显示新回复数量。" @@ -3263,7 +3296,16 @@ zh_CN: favorite_max_not_reached: "将此徽章标记为收藏" favorite_count: "%{count}/%{max} 个徽章已被标记为收藏" download_calendar: + title: "下载日历" + save_ics: "下载 .ics 文件" + save_google: "添加到 Google 日历" + remember: "不再提醒" + remember_explanation: "（您可以在用户偏好设置中更改此配置）" download: "下载" + default_calendar: "默认日历" + add_to_calendar: "添加到日历" + google: "Google 日历" + ics: "ICS" tagging: all_tags: "所有标签" other_tags: "其他标签" @@ -3272,6 +3314,8 @@ zh_CN: changed: "标签更改：" tags: "标签" choose_for_topic: "可选标签" + choose_for_topic_required: + other: "您必须至少选择 %{count} 个标签。" info: "信息" default_info: "此标签不限于任何类别，也没有同义词。要添加限制，请将此标签置于标签组中。" category_restricted: "此标签仅限于您无权访问的类别。" @@ -3423,6 +3467,8 @@ zh_CN: no_read_topics_title: "您还没有阅读任何话题。" no_read_topics_body: "开始阅读讨论后，您将在此处看到一个列表。要开始阅读，请在 置顶 或 类别 或按关键字搜索 %{searchIcon}" no_group_messages_title: "未找到群组消息" + fullscreen_table: + expand_btn: "展开表格" admin_js: type_to_filter: "输入以筛选…" admin: @@ -3611,6 +3657,7 @@ zh_CN: no_description: '（无描述）' all_api_keys: 所有 API 密钥 user_mode: 用户级别 + scope_mode: 范围 impersonate_all_users: 模拟任意用户 single_user: "单个用户" user_placeholder: 输入用户名 @@ -3626,6 +3673,7 @@ zh_CN: 使用范围时，您可以将一个 API 密钥限制到一组特定的端点。 您还可以定义允许哪些参数。使用逗号分隔多个值。 title: 范围 + read_only: 只读 resource: 资源 action: 操作 allowed_parameters: 允许的参数 diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 8ea4c75ca4..163aeaadf7 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -1663,6 +1663,9 @@ zh_TW: watching_first_post: "新話題 %{description}" reaction: "%{username} %{description}" reaction_2: "%{username}、%{username2} %{description}" + dismiss_confirmation: + dismiss: "忽略" + cancel: "取消" group_message_summary: other: "您的收件匣中有%{count}則訊息" popup: diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index f8d88a8cdc..d934df7750 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -2731,47 +2731,6 @@ ar: test_mailer: title: "رسالة الاختبار" subject_template: "[%{email_prefix}] اختبار تسليم الرسالة الإلكترونية" - text_body_template: | - هذه رسالة إلكترونية للاختبار من - - [**%{base_url}**][0] - - إن تسليم الرسائل الإلكترونية عملية معقَّدة. فيما يلي بعض الأمور المهمة التي يجب عليك التحقُّق منها أولًا: - - - تأكَّد من ضبط عنوان "من:" في الرسالة الإلكترونية للإشعار `notification email` بشكلٍ صحيح في إعدادات موقعك. **النطاق المحدَّد في عنوان "من" للرسائل الإلكترونية التي ترسلها هو النطاق الذي سيتم التحقُّق من عنوان بريدك الإلكتروني مقابله**. - - - تعرَّف على كيفية عرض المصدر البسيط للرسالة الإلكترونية في عميل البريد الخاص بك لتتمكن من فحص رؤوس الرسائل الإلكترونية للحصول على أدلة مهمة. في Gmail، هو خيار "إظهار الأصل" في القائمة المنسدلة في أعلى يمين كل رسالة إلكترونية. - - - **مهم: ** هل يحتوي موفِّر خدمة الإنترنت الخاص بك على سجل DNS عكسي تم إدخاله لربط أسماء النطاقات وعناوين IP التي ترسل الرسائل الإلكترونية منها؟ [اختبر سجل PTR العكسي الخاص بك][2] من هنا. إذا لم يُدخِل موفِّر خدمة الإنترنت سجل مؤشر DNS العكسي الصحيح، فمن غير المحتمل تسليم أيٍّ من رسائلك الإلكترونية. - - - هل [سجل SPF][8] الخاص بنطاقك صحيح؟ [اختبر سجل SPF الخاص بك][1] من هنا. لاحظ أن TXT هو نوع السجل الرسمي الصحيح لإطار SPF. - - - هل [سجل DKIM][3] الخاص بنطاقك صحيح؟ سيؤدي ذلك إلى تحسين إمكانية تسليم الرسائل الإلكترونية بشكلٍ كبير. [اختبر سجل DKIM الخاص بك][7] من هنا. - - - إذا شغَّلت خادم البريد الخاص بك، فتأكَّد من أن عناوين IP لخادم البريد الخاص بك [ليست على أي من قوائم حظر عناوين البريد الإلكتروني][4]. تحقَّق أيضًا من أنه يرسل بالتأكيد اسم مضيف مؤهل تمامًا تم تحليله في DNS إلى رسالة HELO الخاصة به. إذا لم يكن الأمر كذلك، فسيؤدي ذلك إلى رفض رسالتك الإلكترونية بواسطة العديد من خدمات البريد. - - - نوصيك بشدة **بإرسال رسالة إلكترونية للاختبار إلى [mail-tester.com][mt]** للتحقُّق من أن كل ما سبق يعمل بشكلٍ صحيح. - - (الطريقة *السهلة* هي إنشاء حساب على [SendGrid][sg] أو [SparkPost] أو [sp] أو [Mailgun][mg] أو [Mailjet][mj] التي لديها خطط بريدية منخفضة التكلفة وستكون جيدة بالنسبة للمجتمعات الصغيرة. ولكن بالرغم من ذلك، ستظل بحاجة إلى إعداد سجلات SPF و DKIM في DNS الخاص بك!) - - نأمل أن تكون قد تلقيت هذه الرسالة الإلكترونية للاختبار بشكلٍ صحيح! - - حظًا سعيدًا، - - أصدقاؤك في [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "رسالة الإصدار الجديد" subject_template: "[%{email_prefix}] إصدار جديد من Discourse، يتوفَّر تحديث" diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml index 6d8689253a..813f5f9743 100644 --- a/config/locales/server.da.yml +++ b/config/locales/server.da.yml @@ -1994,47 +1994,6 @@ da: [Bekræft administratorkonto](%{admin_confirm_url}) test_mailer: subject_template: "[%{email_prefix}] E-mail-leveringstest" - text_body_template: | - Dette er en test e-mail fra - - [**%{base_url}**][0] - - E-mail leverbarhed er kompliceret. Her er et par vigtige ting, du bør tjekke først: - - - Vær *sikker* på at angive `notifikations e-mail` from: adressen korrekt i dine indstillinger for webstedet. **Domænet angivet i "fra" adressen på de e-mails, du sender, er domænet din e-mail vil blive valideret imod**. - - - Vid, hvordan du kan se den rå kilde til e-mailen i din mail-klient, så du kan undersøge e-mail-headere for vigtige indikatorer. I Gmail er det "vis original" i rullemenuen øverst til højre for hver mail. - - - **VIGTIGT:** Har din internetudbyder en omvendt DNS-registrering indtastet for at tilknytte domænenavne og IP-adresser, du sender mail fra? [Test din omvendte PTR-registrering][2] her. Hvis din internetudbyder ikke indtaster den korrekte omvendte DNS pege-registrering, er det meget usandsynligt, at nogen af dine e-mails vil blive leveret. - - - Er dit domænes [SPF-registrering][8] korrekt? [Test din SPF-registrering][1] her. Bemærk, at TXT er den korrekte officielle registreringstype for SPF. - - - Er dit domænes [DKIM-registrering][3] korrekt? Dette vil forbedre leveringen af e-mails betydeligt. [Test din DKIM-registrering][7] her. - - - Hvis du kører din egen mailserver, tjek for at sikre, at IP'erne på din mailserver [ikke er på nogen e-mail-bloklister][4]. Kontroller også, at den helt sikkert sender et fuldt kvalificeret værtsnavn (FQDN), der kan slås op i DNS i sin HELO besked. Hvis ikke, vil dette gøre at din e-mail vil blive afvist af mange posttjenester. - - - Vi anbefaler dig at **sende en test e-mail til [mail-tester.com][mt]** for at verificere, at alt ovenstående fungerer korrekt. - - (Den *lette* måde er at oprette en konto på [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] eller [Mailjet][mj], som har lave mail-omkostnings abonnementer og vil være fint til små fællesskaber. Du skal dog stadig oprette SPF og DKIM-registreringer i din DNS, selvfølgelig!) - - Vi håber, at du har modtaget denne e-mail leveringstest OK! - - Held og lykke, - - Dine venner på [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup. spx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester. om/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www. parkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: subject_template: "[%{email_prefix}] Ny Discourse version, opdatering tilgængelig" new_version_mailer_with_notes: diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index f1f1f805f8..7b0d50036e 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -659,6 +659,7 @@ de: post: image_placeholder: broken: "Dieses Bild ist beschädigt" + hidden_bidi_character: "Bidirektionale Zeichen können die Reihenfolge ändern, in der der Text gerendert wird. Dies könnte dazu genutzt werden, bösartigen Code zu verschleiern." has_likes: one: "%{count} „Gefällt mir“" other: "%{count} „Gefällt mir“" @@ -2457,47 +2458,6 @@ de: test_mailer: title: "Test-E-Mail" subject_template: "[%{email_prefix}] Test der E-Mail-Zustellbarkeit" - text_body_template: | - Dies ist eine Test-E-Mail von - - [**%{base_url}**][0] - - Die Zustellbarkeit von E-Mails ist eine komplizierte Angelegenheit. Nachfolgend ein paar wichtige Aspekte, die du zuerst überprüfen solltest: - - - Stelle *sicher*, dass du die „from:“-Adresse für die `notification email` in den Einstellungen deiner Website korrekt festlegst. **Die Domain, die in der „from“-Adresse deiner E-Mails angegeben ist, ist die Domain, gegen die deine E-Mail validiert wird.** - - - Du solltest wissen, wie du den Roh-Quelltext der E-Mail in deinem Mail-Client anzeigst, damit du die E-Mail-Header auf wichtige Hinweise untersuchen kannst. In Gmail ist es die Option „Original anzeigen“ im Drop-down-Menü oben rechts bei jeder Mail. - - - **WICHTIG:** Hat dein ISP einen Reverse-DNS-Eintrag festgelegt, um die Domain-Namen und IP-Adressen, von denen du Mails sendest, zu verknüpfen? [Teste deinen Reverse-PTR-Eintrag][2] hier. Wenn dein ISP nicht den richtigen Reverse-DNS-Pointer-Record einträgt, ist es sehr unwahrscheinlich, dass deine E-Mails zugestellt werden können. - - - Ist der [SPF-Eintrag][8] deiner Domain korrekt? [Teste deinen SPF-Eintrag][1] hier. Beachte, dass TXT der korrekte offizielle Eintragstyp für SPF ist. - - - Ist der [DKIM-Eintrag][3] deiner Domain korrekt? Dies wird die Zustellbarkeit von E-Mails deutlich verbessern. [Teste deinen DKIM-Eintrag][7] hier. - - - Wenn du deinen eigenen Mailserver betreibst, überprüfe, ob die IPs deines Mailservers [nicht auf irgendwelchen E-Mail-Negativlisten][4] stehen. Überprüfe auch, ob er definitiv einen vollqualifizierten Hostnamen, der im DNS aufgelöst wird, in seiner HELO-Nachricht sendet. Wenn nicht, wird deine E-Mail von vielen Maildiensten abgelehnt. - - - Wir empfehlen dir dringend, **eine Test-E-Mail an [mail-tester.com][mt]** zu senden, um zu überprüfen, ob alles oben genannte korrekt funktioniert. - - (Am *einfachsten* ist es, ein Konto bei [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] oder [Mailjet][mj] zu erstellen, die günstige Mailing-Tarife anbieten und für kleine Communitys gut geeignet sind. Du musst allerdings trotzdem noch die SPF- und DKIM-Einträge in deinem DNS einrichten!) - - Wir hoffen, dass du diesen E-Mail-Zustellbarkeitstest erhalten hast! - - Viel Erfolg! - - Deine Freunde von [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "Neue Version" subject_template: "[%{email_prefix}] Neue Discourse-Version, Update verfügbar" diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index f96801a77c..a6ed300529 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -2453,47 +2453,6 @@ es: test_mailer: title: "Correo electrónico de prueba" subject_template: "[%{email_prefix}] Prueba de envío de correo electrónico" - text_body_template: | - Este es un correo electrónico de prueba de - - [**%{base_url}**][0] - - La entregabilidad del correo electrónico es complicada. Aquí hay algunas cosas importantes que deberías comprobar primero: - - - Asegúrate de establecer correctamente la dirección «correo electrónico de notificación» de: en la configuración de tu sitio. **El dominio especificado en la dirección «de» de los correos electrónicos que envíes es el dominio con el que se validará tu correo electrónico**. - - - Saber ver el origen bruto del correo electrónico en tu cliente de correo, para poder examinar los encabezados del correo en busca de pistas importantes. En Gmail, es la opción «mostrar original» en el menú desplegable de la parte superior derecha de cada correo. - - - **IMPORTANTE:** ¿Tiene tu ISP un registro DNS inverso introducido para asociar los nombres de dominio y las direcciones IP desde las que envías el correo? Prueba tu registro PTR inverso][2] aquí. Si tu ISP no introduce el registro de puntero DNS inverso adecuado, es muy poco probable que se entregue tu correo electrónico. - - - ¿Es correcto el [registro SPF][8] de tu dominio? Prueba tu registro SPF][1] aquí. Ten en cuenta que TXT es el tipo de registro oficial correcto para SPF. - - - ¿Es correcto el [registro DKIM][3] de tu dominio? Esto mejorará significativamente la capacidad de entrega del correo electrónico. Prueba tu registro DKIM][7] aquí. - - - Si diriges tu propio servidor de correo, comprueba que las IP de tu servidor de correo electrónico no están [en ninguna lista de bloqueo de correo electrónico][4]. Comprueba también que definitivamente está enviando un nombre de host totalmente calificado que se resuelve en DNS en su mensaje HELO. Si no es así, tu correo electrónico será rechazado por muchos servicios de correo. - - - Te recomendamos encarecidamente que **envíes un correo electrónico de prueba a [mail-tester.com][mt]** para verificar que todo lo anterior funciona correctamente. - - (La forma *fácil* es crear una cuenta en [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] o [Mailjet][mj], que tienen planes de correo electrónico de bajo coste y estarán bien para comunidades pequeñas. No obstante, tendrás que configurar los registros SPF y DKIM en tus DNS) - - Esperamos que hayas recibido bien esta prueba de entregabilidad del correo electrónico. - - Buena suerte, - - Tus amigos de [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "Correo electrónico de nueva versión" subject_template: "[%{email_prefix}] Nueva versión de Discourse, actualización disponible" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index 91423799ce..c9210b1285 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -397,6 +397,7 @@ fa_IR: post: image_placeholder: broken: "عکس خراب شده است." + hidden_bidi_character: "کارکترهای دو جهته می‌توانند، ترتیب رندر شدن متن را تغییر دهند. این می‌تواند برای پنهان کردن کدهای مخرب استفاده شود." rate_limiter: hours: one: "%{count} ساعت" diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index e94d3808bb..579e56a3a7 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -2425,47 +2425,6 @@ fi: test_mailer: title: "Sähköpostipalvelun testaus" subject_template: "[%{email_prefix}] Sähköpostin toimitettavuustesti" - text_body_template: | - Tämä on testiviesti sivustolta - - [**%{base_url}**][0] - - Sähköpostien toimittaminen on monimutkaista. Tässä on muutamia tärkeitä asioita, jotka sinun tulisi tarkistaa ensin: - - – *Varmista*, että asetat "notification email" -asetuksen lähettäjän osoitteen oikein sivustosi asetuksissa. **Lähettämiesi sähköpostien lähettäjäosoitteessa määritetty verkkotunnus on se verkkotunnus, jota vastaan sähköpostisi tarkistetaan**. - - – Tiedä, miten voit tarkastella sähköpostin raakaa lähdettä sähköpostiohjelmassasi, jotta voit etsiä tärkeitä vihjeitä sähköpostien otsikkotiedoista. Gmailissa se on "näytä alkuperäinen" -valinta avattavassa valikossa jokaisen postin oikeassa yläkulmassa. - - – **TÄRKEÄÄ:** Onko internetpalveluntarjoajallasi käänteinen DNS-tietue, joka yhdistää verkkotunnukset ja IP-osoitteet, joista lähetät sähköpostia? [Testaa käänteinen PTR- tietueesi][2] täällä. Jos internetpalveluntarjoaja ei anna asianmukaista käänteistä DNS-osoitustietuetta, sähköpostiviestisi toimittaminen on erittäin epätodennäköistä. - - – Onko verkkotunnuksesi [SPF-tietue][8] oikein? [Testaa SPF-tietueesi][1] täällä. Huomaa, että TXT on oikea virallinen tietuetyyppi SPF:lle. - - – Onko verkkotunnuksesi [DKIM-tietue][3] oikein? Tämä parantaa merkittävästi sähköpostien toimitusta. [Testaa DKIM-tietueesi][7] täällä. - - – Jos käytät omaa sähköpostipalvelintasi, tarkista, etteivät sähköpostipalvelimesi IP-osoitteet [eivät ole millään sähköpostien estolistalla][4]. Varmista myös, että se lähettää täysin pätevän isäntänimen, joka selvittää DNS:nsä HELO-viestissään. Jos näin ei ole, monet postipalvelut hylkäävät sähköpostiviestisi. - - – Suosittelemme **lähettämään testisähköpostin osoitteeseen [mail-tester.com][mt]** varmistaaksesi, että kaikki edellä mainitut toimivat oikein. - - (*Helppo* tapa on luoda tili [SendGridissä][sg], [SparkPostissa][sp], [Mailgunissa][mg] tai [Mailjetissä][mj], joilla on edullisia postituspaketteja ja soveltuvat pienille yhteisöille. Sinun täytyy kuitenkin vielä määrittää SPF- ja DKIM-tietueet DNS:ssäsi!) - - Toivomme, että tämä sähköpostien toimitettavuustesti tuli perille ongelmitta! - - Onnea, - - Ystäväsi [Discoursella](https://www. iscourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup. spx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester. om/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www. parkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "Uusi versio" subject_template: "[%{email_prefix}] Uusi Discourse-versio, päivitys saatavilla" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index c9a13bdf89..b10a27d496 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -2435,47 +2435,6 @@ fr: test_mailer: title: "Envoyer un courriel de test" subject_template: "[%{email_prefix}] Test de délivrabilité du courriel" - text_body_template: | - Ceci est un message de test envoyé par - - [**%{base_url}**][0] - - La bonne remise des courriels est une affaire un peu compliquée. Voici quelques points importants qu'il vous faudra examiner en premier lieu : - - - Assurez-vous de définir l'adresse de l'expéditeur (le champ « from: ») utilisé par les courriels de notification dans les paramètres de votre site. **Le nom de domaine indiqué dans le champ « from: » des courriels que vous émettez est examiné par des entités tierces pour déterminer si ces courriels sont légitimes ou non**. - - - Assurez-vous de savoir afficher la source d'un courriel dans votre client de messagerie, afin d'en inspecter les en-têtes et d'y chercher des indices importants. Dans Gmail, la fonctionnalité « afficher l'original » (accessible depuis le menu déroulant situé en haut à droite lorsque vous affichez un message) vous permet de le faire. - - - **IMPORTANT :** Votre fournisseur d'accès à Internet a-t-il créé un enregistrement dans le DNS inversé qui permette de faire correspondre le nom de domaine avec les adresses IP depuis lesquels vos courriels sont expédiés ? Vous pouvez [examiner les enregistrements de DNS inversé][2] ici. Si votre fournisseur d'accès n'a pas défini les enregistrements de DNS inversé requis, il est très peu probable que le moindre de vos courriels soit remis à son destinataire. - - - L'[enregistrement SPF][8] de votre nom de domaine est-il valable ? [Examinez votre enregistrement SPF][1] ici. Notez que le type d'enregistrement TXT est celui qui est officiellement requis par le système SPF. - - - L'[enregistrement DKIM][3] de votre nom de domaine est-il valable ? Cela entraînera une amélioration significative de la bonne remise des courriels. [Examinez votre enregistrement DKIM][7] ici. - - - Si vous exploitez votre propre serveur de courriel, assurez-vous que les adresses IP de celui-ci [ne soient pas inscrites sur une ou plusieurs listes de blocage][4]. Assurez-vous aussi que votre serveur, lorsqu'il émet son message HELO, indique un nom d'hôte pleinement qualifié qu'une requête DNS permette de résoudre en adresse IP. Si cette condition n'est pas satisfaite, de nombreux services de courriel rejetteront vos courriels. - - - Nous vous recommandons fortement d'**expédier un courriel de test à l'adresse [mail-tester.com][mt]** pour vous assurer que l'ensemble des éléments indiqués ci-dessus fonctionnent correctement. - - (*Le plus simple* est de créer un compte chez [SendGrid][sg], chez [SparkPost][sp], chez [Mailgun][mg] ou chez [Mailjet][mj]. Ces fournisseurs proposent des forfaits d'envoi de courriel à faible coût, qui suffiront aux petites communautés. Néanmoins, il vous faudra tout de même configurer les enregistrement DNS ayant trait à SPF et à DKIM !) - - En espérant que ce courriel de test de bonne remise vous sera bien parvenu ! - - Bonne chance, - - Vos comparses du projet [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "Nouvelle version" subject_template: "[%{email_prefix}] Nouvelle version de Discourse, mise à jour disponible" diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml index b193f47931..eba4bdb4dc 100644 --- a/config/locales/server.gl.yml +++ b/config/locales/server.gl.yml @@ -2355,47 +2355,6 @@ gl: test_mailer: title: "Proba de servizo de correo" subject_template: "[%{email_prefix}] Proba de entrega de correo" - text_body_template: | - Esta é unha proba de correo de - - [**%{base_url}**][0] - - A entrega do correo é complicada. Aquí están unhas poucas cousas que debería comprobar en primeiro lugar: - - - *Asegúrese* de axustar correctamente o enderezo do «correo electrónico de notificación» de: na configuración do seu sitio. **O dominio especificado no enderezo «de» dos correos que envíe é o dominio contra o que será validado o seu correo**. - - - Aprenda como ver a forma en bruto do correo no seu cliente de correo, de modo que poida examinar as cabeceiras de correo para obter pistas importantes. En Gmail, é o que se chama «show original» no menú despregábel que está na parte superior dereita de cada mensaxe de correo. - - - **IMPORTANTE:** Ten o seu ISP un rexistro de DNS reverso asociado aos nomes de dominio e aos enderezos IP desde os que vostede envía o correo? [Comprobe o seu rexistro PTR reverso[2] aquí. Se o seu ISP non introduce o rexistro apuntador de DNS reverso adecuado, é moi pouco probábel que o seu correo se poida entregar. - - - É o [rexistro SPF][8] do seu dominio correcto? [Probe o seu rexistro SPF][1] aquí. Vexa que TXT é o tipo de rexistro oficial correcto para SPF. - - - É o [rexistro DKIM][3] do seu dominio correcto? Isto mellorará a entrega do correo. [Probe o seu rexistro DKIM][7] aquí. - - - Se ten en marcha o seu propio servidor de correo, comprobe que os IP do seu servidor de correo [non están en ningunha listaxe de bloqueo de correo][4]. Comprobe tamén que se envía un nome de servidor totalmente cualificado que resolve o DNS na súa mensaxe HELO. En caso de que non, o seu correo será rexeitado por moitos servizos de correo. - - - Recomendámoslle encarecidamente que **envíe un correo de probe a [mail-tester.com][mt]** para comprobar que todo o anterior está funcionando correctamente. - - (A maneira *doada* é crear unha conta en [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] ou [Mailjet][mj], que teñen plans de correo de baixo custo e funcionarán ben para pequenas comunidades. Aínda con todo iso, necesitará configurar os rexistros SPF e DKIM no seu DNS!) - - Agardamos que recibise correctamente esta proba de entrega de correo! - - Boa sorte, - - Os amigos de [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "Nova versión de servizo de correo" subject_template: "[%{email_prefix}] Nova versión de Discourse, actualización dispoñible" diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index cbd8e99b39..ac934a45e8 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -690,6 +690,7 @@ he: post: image_placeholder: broken: "תמונה זו פגומה" + hidden_bidi_character: "תווי דו־כיווניות יכולים לשנות את סדר עיבוד הטקסט. אפשר להשתמש בהם להסוואת קוד זדוני." has_likes: one: "לייק %{count}" two: "%{count} לייקים" @@ -2572,47 +2573,6 @@ he: test_mailer: title: "שולח-מיילים לבדיקה" subject_template: "[%{email_prefix}] הודעה לבדיקת יכולות שליחה" - text_body_template: | - זו הודעת בדיקה מאת - - [**%{base_url}**][0] - - העברת דוא״ל היא עניין מסובך. להלן מגוון דברים חשובים שעליך לבדוק תחילה: - - - עליך *לוודא* שהגדרת נכון את כתובת שולח `הודעות ההתראה` בדוא״ל (from - מאת) בהגדרות האתר. **שם התחום שמצוין בכתובת „מאת” של ההודעות שנשלחות בדוא״ל הוא שם התחום שמולו תאומת הודעת הדוא״ל שלך**. - - - מוטב לדעת כדאי לצפות במקור הגולמי של הודעות הדוא״ל בלקוח הדוא״ל שלך כדי שתהיה לך אפשרות לחקור את הכותרות ולקבל רמזים חשובים. ב־Gmail, מדובר באפשרות „הצגת המקור” בתפריט הנפתח שבפינה השמאלית העליונה בכל הודעה שהיא. - - - **חשוב:** האם לספק האינטרנט שלך יש רשומת DNS הפוכה שהוכנסה כדי לשייך את שמות התחום ואת כתובות ה־IP מהם נשלח דוא״ל? [ניתן לבדוק את רשומת ה־PTR ההפוכה שלך][2] כאן. אם הספק שלך לא הגדיר את רשומת המצביע ההפוך ב־DNS כראוי, סביר להניח שההודעות שלך לא תגענה ליעדן. - - - האם [רשומת ה־SPF][8] של שם התחום שלך נכונה? [כדאי לבדוק את רשומת ה־SPF שלך][1] דרך כאן. נא לשים ש־TXT היא סוג הרשומה הרשמית הנכונה עבור SPF. - - - האם [רשומת ה־DKIM][3] של שם התחום שלך נכונה? הגדרה זו תשפר משמעותית את הסיכוי שההודעה שלך תועבר. [ניתן לבדוק את רשומת ה־DKIM][7] דרך כאן. - - - אם יש לך שרת דוא״ל משלך, מוטב לבדוק שכתובות ה־IP של שרת הדוא״ל שלך [אינן מופיעות ברשימות חסימת דוא״ל כלשהן][4]. עליך גם לוודא שהשרת שולח את כתובת השרת המלאה של שם המארח כפי שפותר ה־DNS בהודעת ה־HELO שלו. אם לא, הגדרות שכאלו תגרומנה לכך שהודעות הדוא״ל שלך תידחנה על ידי מגוון רחב של שירותי דוא״ל. - - - אנו ממליצים לך בחום **לשלוח הודעת בדיקה אל [mail-tester.com][mt]** כדי לאמת שכל ההגדרות שצוינו עובדות כראוי. - - (הדרך ה*קלה* היא ליצור חשבון ב־[SendGrid][sg],‏ [SparkPost][sp],‏ [Mailgun][mg] או [Mailjet][mj], שמציעות תכניות נדיבות וזולות ומתאימות לקהילות קטנות. בכל אופן יהיה עליך להגדיר את רשומות ה־SPF וה־DKIM ב־DNS שלך, ליתר ביטחון!) - - אנו מקווים שקיבלת את בדיקת העברת הדוא״ל בצורה תקינה! - - בהצלחה, - - חבריך ב־[Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "שולח-מיילים של גרסה חדשה" subject_template: "[%{email_prefix}] גרסת Discourse חדשה, עדכון זמין." diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index 8f6790acaa..a9891f8c2a 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -656,6 +656,7 @@ it: post: image_placeholder: broken: "Questa immagine è assente" + hidden_bidi_character: "I caratteri bidirezionali possono cambiare l'ordine di visualizzazione del testo. Ciò potrebbe essere utilizzato per nascondere del codice maligno." has_likes: one: "%{count} Mi Piace" other: "%{count} Mi Piace" @@ -2434,47 +2435,6 @@ it: test_mailer: title: "Test Mailer" subject_template: "[%{email_prefix}] Test di Consegna Email" - text_body_template: | - Questa è un'e-mail di prova da - - [**%{base_url}**][0] - - La consegna delle e-mail è complicata. Ecco alcune cose importanti da controllare prima: - - - *Assicurati* di impostare correttamente l'indirizzo da: `notification email` nelle impostazioni del sito. **Il dominio specificato nell'indirizzo "da" delle e-mail inviate è il dominio rispetto al quale avverrà la convalida delle tue e-mail**. - - - Mettiti in condizione di poter analizzare il sorgente non elaborato dell'e-mail nel client di posta, in modo da poter esaminare le intestazioni e-mail per individuare indizi importanti. In Gmail, puoi usare l'opzione "mostra originale" nel menu a discesa in alto a destra di ogni messaggio email. - - - **IMPORTANTE: ** Il tuo ISP ha inserito un record DNS inverso per associare i nomi di dominio e gli indirizzi IP da cui invii la posta? [Prova il tuo record PTR inverso][2] qui. Se il tuo ISP non inserisce il record del puntatore DNS inverso corretto, l'e-mail molto probabilmente non verrà recapitata. - - - Il [record SPF][8] del tuo dominio è corretto? [Prova il tuo record SPF][1] qui. Si noti che TXT è il tipo di record ufficiale corretto per SPF. - - - Il [record DKIM][3] del tuo dominio è corretto? Ciò migliorerà significativamente il corretto recapito delle e-mail. [Prova il tuo record DKIM][7] qui. - - - Se gestisci personalmente il tuo server di posta elettronica, verifica che gli IP del tuo server di posta [non si trovino in elenchi di e-mail bloccate][4]. Verifica inoltre che il server stia inviando un nome host completo traducibile in DNS nel suo messaggio HELO. In caso contrario, si verificherà il rifiuto della tua e-mail da parte di molti servizi di posta elettronica. - - - Consigliamo vivamente di **inviare un'e-mail di prova a [mail-tester.com][mt]** per verificare che tutto quanto sopra indicato funzioni correttamente. - - (Il modo *facile* consiste nel creare un account su [SendGrid],[sg], [SparkPost],[sp], [Mailgun],[mg] o [Mailjet][mj], che offrono piani di abbonamento a servizi e-mail a basso costo e adatti a piccole comunità di utenti. Dovrai comunque configurare i record SPF e DKIM nel tuo DNS!) - - Ci auguriamo che tu abbia ricevuto correttamente questa e-mail di verifica della consegna dei messaggi! - - Cordiali saluti, - - I tuoi amici del team [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "Mailer Nuova Versione" subject_template: "[%{email_prefix}] Nuova versione di Discourse, aggiornamento disponibile" diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index 8bea968472..aeb7435102 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -2356,47 +2356,6 @@ ja: test_mailer: title: "テストメーラー" subject_template: "[%{email_prefix}] メール配信可能性テスト" - text_body_template: | - これは次から送信されたテストメールです。 - - [**%{base_url}**][0] - - メールの配信可能性は複雑な課題です。最初に確認すべき重要な事項を以下に示します。 - - - `notification email` の from: アドレスがサイト設定で正しく設定されていることを*確認してください*。**送信するメールの "from" アドレスに指定されたドメインがメールの検証対象のドメインです**。 - - - メールクライアントでメールの生のソースを表示する方法を確認してください。メールのヘッダーを調査すると、重要な手がかりを得ることができます。Gmail では、各メールの右上にあるドロップダウンメニューに含まれる "メッセージのソースを表示" オプションを使用できます。 - - - **重要:** あなたの ISP には、メールの送信元のドメイン名と IP アドレスを関連付ける逆引き DNS レコードが入力されていますか？こちらで[逆引き PTR レコードをテストしてください][2]。あなたの ISP が適切な逆引き DNS ポインターレコードを登録しない場合、メールが配信される可能性はほぼありません。 - - - あなたのドメインの [SPF レコード][8]は正しいですか？こちらで [SPF レコードをテストしてください][1]。TXT は SPF の正しい正式なレコードタイプであることに注意してください。 - - - ドメインの [DKIM レコード][3]は正しいですか？これによりメールの配信可能性が大幅に改善されます。こちらで [DKIM レコードをテストしてください][7]。 - - - 独自のメールサーバーを実行している場合は、メールサーバーの IP が[どのメールのブロックリストにも追加されていない][4]ことを確認してください。また、HELO メッセージで DNS に解決する完全修飾ホスト名を確実に送信していることを確認してください。送信していない場合は、多数のメールサーバーによってメールが拒否されることになります。 - - - **テストメールを [mail-tester.com][mt] に送信**して、上記すべてが正しく機能していることを確認することを強くお勧めします。 - - ([SendGrid][sg]、[SparkPost][sp]、[Mailgun][mg]、または [Mailjet][mj] でアカウントを作成するのが*簡単*な方法です。これらは安価なメールプランを提供しており、小規模のコミュニティに最適です。ただし、DNS に SPF と DKIM レコードをセットアップする必要はあります！) - - このメールの配信可能性テストがあなたのところに届きますように！ - - それでは幸運を。 - - [Discourse](https://www.discourse.org) 一同より - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "新しいバージョンメーラー" subject_template: "[%{email_prefix}] 新しい Discourse バージョン、更新が利用可能になりました" diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index ba11077aa3..4124a9825c 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -2367,47 +2367,6 @@ ko: test_mailer: title: "메일러 테스트" subject_template: "[%{email_prefix}] 이메일 전달 테스트" - text_body_template: | - 이것은 다음의 테스트 이메일 입니다. - - [**%{base_url}**][0] - - 이메일 전달은 복잡합니다. 다음은 먼저 확인해야 할 몇 가지 중요한 사항입니다: - - - '알림 이메일의 발신' from: 주소를 사이트 설정에서 올바르게 설정했는지 *확인*하십시오. **보내는 이메일의 "보낸 사람" 주소에 지정된 도메인은 이메일의 유효성을 검사 할 도메인입니다**. - - -메일 클라이언트에서 이메일의 중요한 단서를 찾기 위해 이메일 헤더를 조사 할 수 있습니다. Gmail에서는 각 메일의 오른쪽 상단에있는 드롭 다운 메뉴에있는 "원본보기" 옵션입니다. - - -**중요: ** ISP에 메일을 보내는 도메인 이름과 IP 주소를 연결하기 위해 입력된 역 DNS 레코드가 있습니까? [Reverse PTR record 테스트][2]. 사용자님의 ISP에 적절한 역방향 DNS 포인터 레코드를 입력하지 않으면 이메일이 전달 될 가능성이 거의 없습니다. - - -도메인의 [SPF 레코드][8]가 맞습니까? [SPF 레코드 테스트][1]. TXT는 SPF의 올바른 공식 레코드 유형입니다. - - -도메인의 [DKIM 레코드][3]가 맞습니까? 이것은 이메일 전달성을 크게 향상시킵니다. [DKIM 레코드 테스트][7]. - - -자체 메일 서버를 운영하는 경우 메일 서버의 IP가 [이메일 차단 목록에 없음][4] 을 확인하십시오. 또한 HELO 메시지의 DNS에서 확인되는 정규화 된 호스트 이름을 확실히 보내고 있는지 확인합니다. 그렇지 않으면 많은 메일 서비스에서 이메일이 거부됩니다. - - -위의 모든 사항이 올바르게 작동하는지 확인하려면 **[mail-tester.com][mt]**로 테스트 이메일을 보내는 것이 좋습니다. - - (*쉬운* 방법은 [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] 또는 [Mailjet][mj]에 계정을 만드는 것입니다. 이 계정은 저렴한 메일링 계획을 가지고 있으며 괜찮습니다. 소규모 커뮤니티의 경우에도 DNS에 SPF 및 DKIM 레코드를 설정해야합니다!) - - 이 이메일 전달성 테스트를 성공하셨기를 바랍니다! - - 행운을 빕니다, - - 사용자님의 친구들 [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "새 버전 메일러" subject_template: "[%{email_prefix}] 새로운 담화 버전, 업데이트 가능" diff --git a/config/locales/server.lt.yml b/config/locales/server.lt.yml index 673db3131c..3a0a04c354 100644 --- a/config/locales/server.lt.yml +++ b/config/locales/server.lt.yml @@ -482,6 +482,7 @@ lt: post: image_placeholder: broken: "Šis paveikslėlis yra sugadintas" + hidden_bidi_character: "Dvikrypčiai simboliai gali pakeisti teksto pateikimo tvarką. Tai gali būti naudojama kenkėjiškam kodui paslėpti." cannot_permanently_delete: many_posts: "Negalite visam laikui ištrinti šios temos, nes yra kitų įrašų." wait_or_different_admin: "Prieš visam laikui ištrindami šį įrašą, turite palaukti %{time_left} arba kitas administratorius turi tai padaryti." diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 8597fef789..7856337f7a 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -2605,47 +2605,6 @@ pl_PL: test_mailer: title: "Test Powiadomień" subject_template: "[%{email_prefix}] Test dostarczania poczty" - text_body_template: | - To jest wiadomość testowa od - - [**%{base_url}**][0] - - Dostarczanie wiadomości e-mail jest dość skomplikowane. Oto kilka ważnych rzeczy, które powinieneś najpierw sprawdzić: - - - Bądź *pewien* aby zmienić "From:" na poprawny adres w ustawieniach witryny. **Domena określona w adresie "Od:/From:" wysyłanych wiadomości to domena, w której Twój e-mail zostanie zweryfikowany **. - - - Dowiedz się, jak przeglądać surowe źródło wiadomości e-mail w kliencie poczty, dzięki czemu możesz sprawdzić nagłówki wiadomości e-mail w poszukiwaniu ważnych wskazówek. W Gmail jest to opcja "Pokaż oryginał" w rozwijanym menu w prawym górnym rogu każdej wiadomości. - - - **WAŻNE:** Czy twój dostawca usług internetowych ma odwrotny rekord DNS (revDNS) wprowadzony do powiązania nazw domen z adresami IP, z których wysyłasz pocztę? [Przetestuj swój odwrotny rekord PTR][2] tutaj. Jeśli Twój dostawca usług internetowych nie wprowadził poprawnego odwrotnego rekordu DNS, jest bardzo mało prawdopodobne, aby którakolwiek z Twoich korespondencji została dostarczona. - - - Czy [rekord SPF][8] jest poprawnie ustawiony dla Twojej domeny? [Sprawdź swój rekord SPF][1] tutaj. Należy zauważyć, że rekord TXT jest prawidłowym oficjalnym typem dla rekordu SPF. - - - Czy [rekord DKIM][3] jest poprawnie ustawiony dla Twojej domeny? To znacznie poprawi dostarczanie wiadomości e-mail. [Sprawdź swój rekord DKIM][7] tutaj. - - - Jeśli używasz własnego serwera poczty, sprawdź, aby upewnić się, że adresy IP serwera pocztowego [nie znajdują się na blokowanych listach][4]. Sprawdź, czy na pewno wysyłasz w pełni kwalifikowaną nazwę hosta, która rozwiązuje się przez DNS w wiadomości HELO. Jeśli nie, to spowoduje, że Twój e-mail zostanie odrzucony przez wiele serwisów pocztowych. - - - Zalecamy **wysłanie wiadomości testowej na adres [mail-tester.com][mt]**, aby sprawdzić, czy wszystkie powyższe punkty zostały spełnione. - - (*Najłatwiejszy* sposób to utworzenie konta na [SendGrid][sg], [SparkPost][sp] [Mailgun][mg] lub [Mailjet][mj], które mają tanie plany mailingowe i będą dobre dla małych społeczności. Nadal będziesz musiał skonfigurować rekordy SPF i DKIM w swoim DNS!) - - Mamy nadzieję, że otrzymałeś/łaś ten testowy e-mail. - - Powodzenia, - - Twoi przyjaciele na [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "Nowa wersja powiadomień" subject_template: "[%{email_prefix}] Nowa wersja Discourse jest dostępna" diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index d0eb0e43d0..1444b187e9 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -2440,47 +2440,6 @@ pt_BR: test_mailer: title: "Testar mensageiro" subject_template: "[%{email_prefix}] Teste de entrega de e-mail" - text_body_template: | - Este é um e-mail de teste de - - [**%{base_url}**][0] - - Estamos com dificuldades para entregar o e-mail. Confira algumas coisas importantes que precisam ser verificadas: - - - Defina o "e-mail de notificação" corretamente nas configurações do site. **O domínio especificado no endereço "de" dos e-mails enviados é o domínio com o qual o seu e-mail será validado**. - - - Visualize a origem não processada no seu cliente de e-mail, de forma que você possa conferir os cabeçalhos de e-mail para obter pistas importantes. No Gmail, é a opção "mostrar original" no menu suspenso, no canto superior à direita de cada e-mail. - - - **IMPORTANTE:** Seu ISP tem um registro de DNS reverso inserido para associar os nomes de domínio e endereços IP a partir dos quais você envia e-mail? [Teste seu registro PTR reverso][2] aqui. Se o seu ISP não inserir o registro de ponteiro DNS reverso apropriado, existe pouquíssima probabilidade de que seu e-mail seja entregue. - - - Se o [registro SPF] do seu domínio[8] está correto. [Teste seu registro SPF][1] aqui. Observe que o TXT é o tipo de registro oficial correto para o SPF. - - - Se o [registro DKIM] do seu domínio[3] está correto. Isso irá aumentará muito a chance de o seu e-mail ser entregue. [Teste seu registro DKIM][7] aqui. - - - Se você rodar seu próprio servidor de e-mail, verifique se os IPs do seu servidor de e-mail não [estão em nenhuma lista de bloqueio de e-mails][4]. Além disso, verifique se está sendo enviado um nome de host plenamente qualificado que é resolvido no DNS da sua mensagem HELO. Caso contrário, isso fará que o seu e-mail seja rejeitado por vários serviços. - - - É altamente recomendável **enviar um e-mail de teste para [mail-tester.com][mt]** para verificar se tudo o que foi mencionado acima está funcionando corretamente. - - (Esta é a maneira *fácil* de criar uma conta em [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] ou [Mailjet][mj], que tem planos de e-mail de baixo custo para comunidades pequenas. Mas ainda será preciso definir os registros DKIM e SPF no seu DNS!) - - Esperamos que você tenha recebido este teste de entrega de e-mail! - - Boa sorte, - - Seus amigos do [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "Nova versão do mensageiro" subject_template: "[%{email_prefix}] Nova versão do Discourse, atualização disponível" diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index d4b50a68ca..f4b05b0f16 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -713,6 +713,7 @@ ru: post: image_placeholder: broken: "Некорректный файл изображения" + hidden_bidi_character: "Двунаправленные символы могут изменить порядок отображения текста. Это может быть использовано для сокрытия вредоносного кода." has_likes: one: "%{count} симпатия" few: "%{count} симпатии" @@ -2602,48 +2603,6 @@ ru: test_mailer: title: "Отправка тестового письма" subject_template: "[%{email_prefix}] Проверка доставки электронного письма" - text_body_template: | - Это тестовое письмо от - - [**%{base_url}**][0] - - Отправка электронной почты - процесс непростой. Вот несколько важных вещей, на которые вы должны обратить внимание: - - - Убедитесь, что в настройках сайта указан корректный электронный адрес для отправки уведомлений. - **Домен, указанный в этом адресе, является доменом, по которому будет проверяться ваша электронная почта**. - - - Узнайте как просматривать исходный текст сообщения электронной почты в своем почтовом клиенте, чтобы при необходимости можно было изучить заголовки электронной почты на предмет важных подсказок. В Gmail это опция «Показать оригинал», расположенная в раскрывающемся меню в правом верхнем углу каждого письма. - - - **ВАЖНО:** Убедитесь, что ваш интернет-провайдер поддерживает обратный DNS [Проверьте запись типа PTR][2] здесь. Если ваш интернет-провайдер не введет правильную запись указателя в обратной зоне DNS, маловероятно, что какое-либо из ваших сообщений электронной почты будет доставлено. - - - Правильно ли настроена [SPF-запись][8] вашего домена? [Проверьте SPF-запись][1] здесь. Обратите внимание, что TXT-запись - это правильный тип записи для SPF. - - - Правильно ли настроена [DKIM-подпись][3] вашего домена? Это значительно улучшит безопасность доставки электронной почты. [Проверьте DKIM-подпись]][7] здесь. - - - Если у вас есть собственный почтовый сервер, убедитесь, что IP-адреса вашего почтового сервера [не включены ни в какие списки блокировки электронной почты][4]. Также убедитесь, что сервер отправляет полное имя хоста, которое разрешается в DNS в сообщении HELO. Если это не так, то ваше письмо будет отклоняться значительным количеством почтовых служб. - - - Мы настоятельно рекомендуем вам **отправить тестовое письмо по адресу [mail-tester.com][mt]**, чтобы убедиться, что все вышеперечисленные настройки работают правильно. - - (*Простой* способ использования внешнего почтового сервера - создать учетную запись на рассылочном сервисе, например на [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] или [Mailjet][mj], которые предоставляют недорогие тарифные планы рассылки и вполне подойдут для небольших сообществ. Однако вам все равно придется настроить SPF-запись и DKIM-подпись в DNS!) - - Мы надеемся, что вы получили это письмо с подтверждением доставки! - - Удачи, - - Ваши друзья с сайта [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "Установка обновления" subject_template: "[%{email_prefix}] Доступна новая версия Discourse" diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml index 32c14d9e8e..cc5c6ffda7 100644 --- a/config/locales/server.sv.yml +++ b/config/locales/server.sv.yml @@ -639,6 +639,7 @@ sv: post: image_placeholder: broken: "Den här bilden är trasig" + hidden_bidi_character: "Dubbelriktade tecken kan ändra ordningen som text renderas. Detta kan användas för att dölja skadlig kod." has_likes: one: "%{count} gillning" other: "%{count} gillningar" @@ -2423,47 +2424,6 @@ sv: test_mailer: title: "Test per e-post" subject_template: "[%{email_prefix}] Leveranstest för e-post" - text_body_template: | - Detta är ett e-posttest från - - [**%{base_url}**][0] - - E-postleverans är komplicerat. Här är några viktiga saker som du bör kontrollera först: - - - Var *säker* på att ange från-adressen för `notification email` korrekt i dina webbplatsinställningar. **Den domän som anges i "från"-adressen för e-postmeddelanden du skickar är den domän som din e-post kommer att valideras mot**. - - - Ha kunskap om hur du ser e-postmeddelandets i rå-text för din e-postklient, så att du kan undersöka e-posthuvudena efter viktiga ledtrådar. I Gmail görs detta genom alternativet "visa original" i rullgardinsmenyn längst upp till höger i varje e-post. - - - **VIKTIGT:** Har din ISP en omvänd DNS-post angiven för att koppla de domännamn och IP-adresser som du skickar e-post från? [Testa din omvända PTR-data][2] här. Om din ISP inte anger rätt omvänd DNS-pekardata är det mycket osannolikt att något av dina e-postmeddelanden kommer att levereras. - - - Är din domäns [SPF-data][8] korrekt? [Testa din SPF-data][1] här. Observera att TXT är rätt officiell posttyp för SPF. - - - Är din domäns [DKIM-data][3] korrekt? Detta kommer att förbättra e-postleveransen avsevärt. [Testa din DKIM-data][7] här. - - - Om du kör din egen e-postserver, kontrollera att din e-postservers IP-adresser inte är [svartlistade][4]. Kontrollera också att den definitivt skickar ett fullt kvalificerat värdnamn som omvandlas till DNS i HELO-meddelandet. Annars kommer din e-post att avvisas av många e-posttjänster. - - - Vi rekommenderar starkt att du **skickar ett testmeddelande till [mail-tester.com][mt]** för att verifiera att allt ovan fungerar korrekt. - - (Det *enkla* sättet är att skapa ett konto på [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] eller [Mailjet][mj], som har billiga e-postpaket och är tillräckligt för mindre gemenskaper. Du måste dock ställa in SPF- och DKIM-data för din DNS!) - - Vi hoppas att detta e-postleveranstest kom fram! - - Lycka till! - - Dina vänner på [Discourse](https://www.discourse.org) - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "E-post om ny version" subject_template: "[%{email_prefix}] Ny version av Discourse, uppdatering tillgänglig" diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index ad20c95e85..9d56307ed5 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -635,6 +635,9 @@ zh_CN: broken: "此图片已损坏" has_likes: other: "%{count} 个赞" + cannot_permanently_delete: + many_posts: "您不能永久删除此主题，因为还有其他帖子。" + wait_or_different_admin: "您必须等待 %{time_left} 才能永久删除此帖子，否则必须由其他管理员执行此操作。" rate_limiter: slow_down: "您执行此操作的次数过多，请稍后再试。" too_many_requests: "您执行此操作的次数过多。请等待 %{time_left}后再试。" @@ -901,6 +904,7 @@ zh_CN: remove: "此话题不再是横幅。它将不再显示在每个页面的顶部。" unsubscribed: title: "已更新电子邮件偏好设置！" + description: "%{email} 的电子邮件偏好设置已更新。要更改您的电子邮件设置，请访问您的用户偏好设置。" topic_description: "要重新订阅%{link}，请使用话题底部或右侧的通知控件。" private_topic_description: "要重新订阅，请使用话题底部或右侧的通知控件。" uploads: @@ -1402,6 +1406,7 @@ zh_CN: summary_percent_filter: "当用户点击“总结此话题”时，显示前百分之几的帖子" summary_max_results: "“总结此话题”返回的最大帖子数量" summary_timeline_button: "在时间线中显示“总结”按钮" + enable_personal_messages: "允许信任级别 1（可通过最小信任级别配置来发送消息）用户创建消息和回复消息。注意：管理人员不受限制。" enable_system_message_replies: "即使禁用了个人消息，也允许用户回复系统消息" enable_long_polling: "用于通知的消息总线可以使用长轮询" enable_chunked_encoding: "启用服务器的分块编码响应。此功能适用于大多数设置，但某些代理可能会缓冲，导致响应延迟" @@ -1732,6 +1737,7 @@ zh_CN: topic_view_duration_hours: "每个 IP/用户每 N 小时计算一次新话题浏览" user_profile_view_duration_hours: "每个 IP/用户每 N 小时计算一次新用户个人资料浏览" levenshtein_distance_spammer_emails: "在匹配垃圾信息发布者电子邮件时，仍然允许模糊匹配的字符数差异。" + max_new_accounts_per_registration_ip: "如果已经有 (n) 个来自此 IP 的信任级别 0 帐户（并且没有一个是管理人员或者是 TL2 或更高级别），则停止接受来自该 IP 的新注册。" min_ban_entries_for_roll_up: "点击“汇总”按钮时，如果至少有 (N) 个条目，将创建一个子网禁止条目" max_age_unmatched_emails: "在 (N) 天后删除不匹配的已屏蔽电子邮件条目。" max_age_unmatched_ips: "在 (N) 天后删除不匹配的已屏蔽 IP 条目。" @@ -2369,47 +2375,6 @@ zh_CN: test_mailer: title: "测试邮件" subject_template: "[%{email_prefix}] 电子邮件能否递送成功测试" - text_body_template: | - 这是一封测试电子邮件，来自 - - [**%{base_url}**][0] - - 电子邮件能否递送成功取决于很多因素。下面是几个您需要首先留意的重要方面： - - - 请*确保*在站点设置中正确设置 `notification email` from: 地址。**您所发出的电子邮件的“发件人”地址中指定的网域需要进行验证**。 - - - 知道如何使用您的邮件客户端查看电子邮件原始内容，这样您能够检查电子邮件标头以获取重要线索。在 Gmail 中，每封邮件右上角的下拉菜单中都会提供“显示原始邮件”选项。 - - - **重要提示**：您的 ISP 是否输入了反向 DNS 记录以关联您用于发送邮件的域名和 IP 地址？[测试您的反向 PTR 记录][2]。如果您的 ISP 未输入正确的反向 DNS 记录，您的电子邮件不太可能递送成功。 - - - 您的网域的 [SPF 记录][8]正确吗？[测试您的 SPF 记录][1]。注意 SPF 的官方记录类型是 TXT。 - - - 您的网域的 [DKIM 记录][3]正确吗？这会显著提升电子邮件递送成功几率。[测试您的 DKIM 记录][7]。 - - - 如果您使用自建的邮件服务器，请确保您的邮件服务器的 IP [不在电子邮件屏蔽名单中][4]。还要验证它肯定发送一个可以在 HELO 消息中解析 DNS 的完全限定主机名。否则，您的电子邮件会被许多邮件服务拒绝。 - - - 强烈建议您**向 [mail-tester.com][mt] 发送一封测试邮件**以验证上述所有设置正常。 - - （一种*简单的*方法是创建一个 [SendGrid][sg]、[SparkPost][sp]、[Mailgun][mg] 或 [Mailjet][mj] 帐户，这些平台提供适用于小型社区的低成本邮寄方案。不过，您仍然需要在 DNS 中设置 SPF 和 DKIM 记录！） - - 希望您能成功收到这封测试邮件！ - - 祝君好运， - - 您在 [Discourse](https://www.discourse.org) 的伙伴 - - [0]: %{base_url} - [1]: https://www.kitterman.com/spf/validate.html - [2]: https://mxtoolbox.com/ReverseLookup.aspx - [3]: http://www.dkim.org/ - [4]: https://whatismyipaddress.com/blacklist-check - [7]: https://www.mail-tester.com/spf-dkim-check - [8]: http://www.openspf.org/SPF_Record_Syntax - [sg]: https://goo.gl/r1WMF6 - [sp]: https://www.sparkpost.com/ - [mg]: https://www.mailgun.com/ - [mj]: https://www.mailjet.com/pricing/ - [mt]: https://www.mail-tester.com/ new_version_mailer: title: "新版本邮件" subject_template: "[%{email_prefix}] 新 Discourse 版本，有可用更新" diff --git a/plugins/discourse-local-dates/config/locales/client.zh_CN.yml b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml index df7ca0ee68..0680e25a67 100644 --- a/plugins/discourse-local-dates/config/locales/client.zh_CN.yml +++ b/plugins/discourse-local-dates/config/locales/client.zh_CN.yml @@ -40,3 +40,4 @@ zh_CN: every_three_months: "每三个月" every_six_months: "每六个月" every_year: "每年" + default_title: "%{site_name} 事件" diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml index a51d6bf8a9..ffb5c15e76 100644 --- a/plugins/poll/config/locales/client.pt.yml +++ b/plugins/poll/config/locales/client.pt.yml @@ -43,6 +43,9 @@ pt: show-results: title: "Exibir os resultados da sondagem" label: "Mostrar resultados" + remove-vote: + title: "Remova o seu voto" + label: "Remover voto" hide-results: title: "Voltar para os seus votos" label: "Mostrar voto" diff --git a/plugins/poll/config/locales/client.zh_CN.yml b/plugins/poll/config/locales/client.zh_CN.yml index 5d7a6d69be..ba3a77cf0d 100644 --- a/plugins/poll/config/locales/client.zh_CN.yml +++ b/plugins/poll/config/locales/client.zh_CN.yml @@ -38,6 +38,9 @@ zh_CN: show-results: title: "显示投票结果" label: "显示结果" + remove-vote: + title: "移除您的投票" + label: "移除投票" hide-results: title: "回到您的投票" label: "显示投票" diff --git a/plugins/poll/config/locales/server.de.yml b/plugins/poll/config/locales/server.de.yml index ee0208f36a..52e560b275 100644 --- a/plugins/poll/config/locales/server.de.yml +++ b/plugins/poll/config/locales/server.de.yml @@ -40,6 +40,13 @@ de: user_cant_post_in_topic: "Du kannst nicht abstimmen, weil du in diesem Thema nicht schreiben kannst." topic_must_be_open_to_vote: "Das Thema muss zum Abstimmen geöffnet sein." poll_must_be_open_to_vote: "Die Umfrage muss zum Abstimmen gestartet sein." + one_vote_per_user: "Für diese Umfrage ist nur 1 Stimme erlaubt." + max_vote_per_user: + one: Nur %{count} Stimmen sind für diese Umfrage erlaubt. + other: Für diese Umfrage sind maximal %{count} Stimmen erlaubt. + min_vote_per_user: + one: Für diese Umfrage ist mindestens %{count} Stimmen erforderlich. + other: Für diese Umfrage sind mindestens %{count} Stimmen erforderlich. topic_must_be_open_to_toggle_status: "Damit du den Status ändern kannst, muss das Thema geöffnet sein." only_staff_or_op_can_toggle_status: "Nur ein Team-Mitglied und der Autor des Beitrags können den Status der Umfrage ändern." insufficient_rights_to_create: "Du darfst keine Umfragen erstellen." diff --git a/plugins/poll/config/locales/server.he.yml b/plugins/poll/config/locales/server.he.yml index 4670e69ab1..f69fc4a4f0 100644 --- a/plugins/poll/config/locales/server.he.yml +++ b/plugins/poll/config/locales/server.he.yml @@ -44,6 +44,17 @@ he: user_cant_post_in_topic: "אין לך אפשרות להצביע כיוון שאין לך אפשרות לפרסם בנושא זה." topic_must_be_open_to_vote: "הנושא חייב להיות פתוח להצבעות." poll_must_be_open_to_vote: "הסקר חייב להיות פתוח להצבעות." + one_vote_per_user: "רק הצבעה אחת מותרת לסקר זה." + max_vote_per_user: + one: רק הצבעה %{count} מותרת לסקר זה. + two: רק %{count} הצבעות מותרות לסקר זה. + many: רק %{count} הצבעות מותרות לסקר זה. + other: רק %{count} הצבעות מותרות לסקר זה. + min_vote_per_user: + one: כמות מזערית של הצבעה %{count} נדרשת לסקר זה. + two: כמות מזערית של %{count} הצבעות מותרות לסקר זה. + many: כמות מזערית של %{count} הצבעות מותרות לסקר זה. + other: כמות מזערית של %{count} הצבעות מותרות לסקר זה. topic_must_be_open_to_toggle_status: "הנושא חייב להיות פתוח לשינויי מצב." only_staff_or_op_can_toggle_status: "רק חבר צוות או המפרסם המקורי יכולים לשנות מצב של סקר." insufficient_rights_to_create: "אין לך הרשאה ליצור סקרים." diff --git a/plugins/poll/config/locales/server.ko.yml b/plugins/poll/config/locales/server.ko.yml index 0fdc6e6baa..df9359c662 100644 --- a/plugins/poll/config/locales/server.ko.yml +++ b/plugins/poll/config/locales/server.ko.yml @@ -38,6 +38,7 @@ ko: user_cant_post_in_topic: "이 주제에 게시 할 수 없으므로 투표 할 수 없습니다." topic_must_be_open_to_vote: "토픽이 열려야 투표를 할 수 있습니다." poll_must_be_open_to_vote: "투표가 열려있어야 표결할 수 있습니다." + one_vote_per_user: "이 투표에는 1표만 허용됩니다." topic_must_be_open_to_toggle_status: "토픽이 열려야 상태 변경을 할 수 있습니다." only_staff_or_op_can_toggle_status: "운영진이나 작성자만이 투표 상태를 변경할 수 있습니다." insufficient_rights_to_create: "설문 조사를 만들 수 없습니다." diff --git a/plugins/poll/config/locales/server.ru.yml b/plugins/poll/config/locales/server.ru.yml index 49efc1f5f0..7f237ad5a3 100644 --- a/plugins/poll/config/locales/server.ru.yml +++ b/plugins/poll/config/locales/server.ru.yml @@ -44,6 +44,17 @@ ru: user_cant_post_in_topic: "Вы не можете голосовать, поскольку вы не можете создавать сообщения в этой теме." topic_must_be_open_to_vote: "Для проведения голосования тема должна быть открыта." poll_must_be_open_to_vote: "Для проведения голосования опрос должен быть открыт." + one_vote_per_user: "В этом опросе допускается только 1 голос." + max_vote_per_user: + one: В этом опросе допускается только %{count} голос. + few: В этом опросе допускается только %{count} голоса. + many: В этом опросе допускается не более %{count} голосов. + other: В этом опросе допускается не более %{count} голосов. + min_vote_per_user: + one: В этом опросе требуется минимум %{count} голос. + few: В этом опросе требуется минимум %{count} голоса. + many: В этом опросе требуется минимум %{count} голосов. + other: В этом опросе требуется минимум %{count} голосов. topic_must_be_open_to_toggle_status: "Для изменения статуса тема должна быть открыта." only_staff_or_op_can_toggle_status: "Только модераторы или автор могут поменять статус опроса." insufficient_rights_to_create: "Вы не можете создавать опросы." diff --git a/plugins/poll/config/locales/server.sv.yml b/plugins/poll/config/locales/server.sv.yml index 89f76168c0..ab2dc34894 100644 --- a/plugins/poll/config/locales/server.sv.yml +++ b/plugins/poll/config/locales/server.sv.yml @@ -40,6 +40,13 @@ sv: user_cant_post_in_topic: "Du kan inte rösta eftersom du inte kan göra inlägg i detta ämne." topic_must_be_open_to_vote: "Detta ämne måste vara öppet för att kunna rösta." poll_must_be_open_to_vote: "Omröstning måste vara öppen för att kunna rösta." + one_vote_per_user: "Endast 1 röst tillåts för denna omröstning." + max_vote_per_user: + one: Endast %{count} röst tillåts för denna omröstning. + other: Högst %{count} röster tillåts för denna omröstning. + min_vote_per_user: + one: Minst %{count} röst krävs för denna omröstning. + other: Minst %{count} röster krävs för denna omröstning. topic_must_be_open_to_toggle_status: "Ämnet måste vara öppet för att kunna växla status." only_staff_or_op_can_toggle_status: "Endast personal eller ursprungsskribenten kan växla status på en omröstning." insufficient_rights_to_create: "Du är inte behörig att skapa omröstningar." From 0ededb14547d6a258cf9c50a9e7f0c995f8aed1b Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Tue, 23 Nov 2021 23:24:58 +0530 Subject: [PATCH 067/168] UX: timestamp should not hide handle of topic timeline in mobile. (#15066) Previously, since the space of the timestamp is big in some locales, it blocked the visibility of topic timeline handle in mobile view. --- app/assets/stylesheets/common/topic-timeline.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss index 40bb7267c1..159e82097c 100644 --- a/app/assets/stylesheets/common/topic-timeline.scss +++ b/app/assets/stylesheets/common/topic-timeline.scss @@ -241,6 +241,9 @@ .timeline-ago { color: var(--primary-med-or-secondary-med); + max-width: 70px; + overflow: hidden; + text-overflow: ellipsis; } .timeline-scroller { From 73760c77d9fa004fce499251cbc1c98e21891957 Mon Sep 17 00:00:00 2001 From: Bianca Nenciu Date: Tue, 23 Nov 2021 22:25:54 +0200 Subject: [PATCH 068/168] FEATURE: Mention @here to notify users in topic (#14900) Use @here to mention all users that were allowed to topic directly or through group, who liked topics or read the topic. Only first 10 users will be notified. --- .../app/components/composer-editor.js | 17 ++++++- .../discourse/app/controllers/composer.js | 11 +++++ .../discourse/app/templates/composer.hbs | 1 + app/controllers/users_controller.rb | 16 +++++-- app/models/user.rb | 2 + app/services/post_alerter.rb | 30 ++++++++++-- config/locales/client.en.yml | 3 ++ config/locales/server.en.yml | 4 ++ config/site_settings.yml | 8 ++++ lib/guardian.rb | 9 ++++ lib/validators/not_username_validator.rb | 15 ++++++ spec/components/guardian_spec.rb | 40 ++++++++++++++++ spec/services/post_alerter_spec.rb | 48 +++++++++++++++++++ 13 files changed, 197 insertions(+), 7 deletions(-) create mode 100644 lib/validators/not_username_validator.rb diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js index 317bdd9d0b..a32f47eaf9 100644 --- a/app/assets/javascripts/discourse/app/components/composer-editor.js +++ b/app/assets/javascripts/discourse/app/components/composer-editor.js @@ -561,10 +561,11 @@ export default Component.extend(ComposerUpload, { _renderUnseenMentions(preview, unseen) { // 'Create a New Topic' scenario is not supported (per conversation with codinghorror) // https://meta.discourse.org/t/taking-another-1-7-release-task/51986/7 - fetchUnseenMentions(unseen, this.get("composer.topic.id")).then(() => { + fetchUnseenMentions(unseen, this.get("composer.topic.id")).then((r) => { linkSeenMentions(preview, this.siteSettings); this._warnMentionedGroups(preview); this._warnCannotSeeMention(preview); + this._warnHereMention(r.here_count); }); }, @@ -639,6 +640,20 @@ export default Component.extend(ComposerUpload, { }); }, + _warnHereMention(hereCount) { + if (!hereCount || hereCount === 0) { + return; + } + + later( + this, + () => { + this.hereMention(hereCount); + }, + 2000 + ); + }, + @bind _handleImageScaleButtonClick(event) { if (!event.target.classList.contains("scale-btn")) { diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js index 47a8fc8abd..016ed8d3bd 100644 --- a/app/assets/javascripts/discourse/app/controllers/composer.js +++ b/app/assets/javascripts/discourse/app/controllers/composer.js @@ -719,6 +719,17 @@ export default Controller.extend({ }); }, + hereMention(count) { + this.appEvents.trigger("composer-messages:create", { + extraClass: "custom-body", + templateName: "custom-body", + body: I18n.t("composer.here_mention", { + here: this.siteSettings.here_mention, + count, + }), + }); + }, + applyUnorderedList() { this.toolbarEvent.applyList("* ", "list_item"); }, diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs index 4d6a4c32f3..26f8f21b32 100644 --- a/app/assets/javascripts/discourse/app/templates/composer.hbs +++ b/app/assets/javascripts/discourse/app/templates/composer.hbs @@ -129,6 +129,7 @@ uploadProgress=uploadProgress groupsMentioned=(action "groupsMentioned") cannotSeeMention=(action "cannotSeeMention") + hereMention=(action "hereMention") importQuote=(action "importQuote") togglePreview=(action "togglePreview") processPreview=showPreview diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6cf254972a..b4919f5c9d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -494,10 +494,19 @@ class UsersController < ApplicationController usernames.each(&:downcase!) cannot_see = [] + here_count = nil + topic_id = params[:topic_id] - unless topic_id.blank? - topic = Topic.find_by(id: topic_id) - usernames.each { |username| cannot_see.push(username) unless Guardian.new(User.find_by_username(username)).can_see?(topic) } + if topic_id.present? && topic = Topic.find_by(id: topic_id) + usernames.each do |username| + if !Guardian.new(User.find_by_username(username)).can_see?(topic) + cannot_see.push(username) + end + end + + if usernames.include?(SiteSetting.here_mention) && guardian.can_mention_here? + here_count = PostAlerter.new.expand_here_mention(topic.first_post, exclude_ids: [current_user.id]).size + end end result = User.where(staged: false) @@ -509,6 +518,7 @@ class UsersController < ApplicationController valid_groups: groups, mentionable_groups: mentionable_groups, cannot_see: cannot_see, + here_count: here_count, max_users_notified_per_group_mention: SiteSetting.max_users_notified_per_group_mention } end diff --git a/app/models/user.rb b/app/models/user.rb index 3bc2adb737..40c48bd150 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -285,6 +285,8 @@ class User < ActiveRecord::Base def self.reserved_username?(username) username = normalize_username(username) + return true if SiteSetting.here_mention == username + SiteSetting.reserved_usernames.unicode_normalize.split("|").any? do |reserved| username.match?(/^#{Regexp.escape(reserved).gsub('\*', '.*')}$/) end diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb index 1847fa42a4..31efae476c 100644 --- a/app/services/post_alerter.rb +++ b/app/services/post_alerter.rb @@ -111,9 +111,9 @@ class PostAlerter notified = [post.user, post.last_editor].uniq # mentions (users/groups) - mentioned_groups, mentioned_users = extract_mentions(post) + mentioned_groups, mentioned_users, mentioned_here = extract_mentions(post) - if mentioned_groups || mentioned_users + if mentioned_groups || mentioned_users || mentioned_here mentioned_opts = {} editor = post.last_editor @@ -131,6 +131,12 @@ class PostAlerter users = only_allowed_users(users, post) notified += notify_users(users - notified, :group_mentioned, post, mentioned_opts.merge(group: group)) end + + if mentioned_here + users = expand_here_mention(post, exclude_ids: notified.map(&:id)) + users = only_allowed_users(users, post) + notified += notify_users(users - notified, :mentioned, post, mentioned_opts) + end end # replies @@ -543,6 +549,21 @@ class PostAlerter end + def expand_here_mention(post, exclude_ids: nil) + posts = Post.where(topic_id: post.topic_id) + posts = posts.where.not(user_id: exclude_ids) if exclude_ids.present? + + if post.user.staff? + posts = posts.where(post_type: [Post.types[:regular], Post.types[:whisper]]) + else + posts = posts.where(post_type: Post.types[:regular]) + end + + User.real + .where(id: posts.select(:user_id)) + .limit(SiteSetting.max_here_mentioned) + end + # TODO: Move to post-analyzer? def extract_mentions(post) mentions = post.raw_mentions @@ -557,7 +578,10 @@ class PostAlerter users = nil if users.empty? end - [groups, users] + # @here can be a user mention and then this feature is disabled + here = mentions.include?(SiteSetting.here_mention) && Guardian.new(post.user).can_mention_here? + + [groups, users, here] end # TODO: Move to post-analyzer? diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 5546027cd1..30d77f99d2 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2105,6 +2105,9 @@ en: cannot_see_mention: category: "You mentioned %{username} but they won't be notified because they do not have access to this category. You will need to add them to a group that has access to this category." private: "You mentioned %{username} but they won't be notified because they are unable to see this personal message. You will need to invite them to this PM." + here_mention: + one: "By mentioning @%{here}, you are about to notify %{count} user – are you sure?" + other: "By mentioning @%{here}, you are about to notify %{count} users – are you sure?" duplicate_link: "It looks like your link to %{domain} was already posted in the topic by @%{username} in a reply on %{ago} – are you sure you want to post it again?" reference_topic_title: "RE: %{title}" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 209a271b91..191dcf3f4a 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1883,6 +1883,9 @@ en: max_mentions_per_post: "Maximum number of @name notifications anyone can use in a post." max_users_notified_per_group_mention: "Maximum number of users that may receive a notification if a group is mentioned (if threshold is met no notifications will be raised)" enable_mentions: "Allow users to mention other users." + here_mention: "Name used for @here mention. Must not be an existent username." + max_here_mentioned: "Maximum number of mentioned people by @here." + min_trust_level_for_here_mention: "The minimum trust level allowed to mention @here." create_thumbnails: "Create thumbnails and lightbox images that are too large to fit in a post." @@ -2325,6 +2328,7 @@ en: invalid_css_color: "Invalid color. Enter a color name or hex value." invalid_email: "Invalid email address." invalid_username: "There's no user with that username." + valid_username: "There's a user with that username." invalid_group: "There's no group with that name." invalid_integer_min_max: "Value must be between %{min} and %{max}." invalid_integer_min: "Value must be %{min} or greater." diff --git a/config/site_settings.yml b/config/site_settings.yml index 1edf130787..2b31929444 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -873,6 +873,14 @@ posting: max_users_notified_per_group_mention: 100 newuser_max_replies_per_topic: 3 newuser_max_mentions_per_post: 2 + here_mention: + default: "here" + validator: "NotUsernameValidator" + client: true + max_here_mentioned: 10 + min_trust_level_for_here_mention: + default: "2" + enum: "TrustLevelAndStaffSetting" title_max_word_length: default: 30 locale_default: diff --git a/lib/guardian.rb b/lib/guardian.rb index 983fd0daa8..7651baf063 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -541,6 +541,15 @@ class Guardian UserAuthToken.hash_token(token) if token end + def can_mention_here? + return false if SiteSetting.here_mention.blank? + return false if SiteSetting.max_here_mentioned < 1 + return false if !authenticated? + return false if User.where(username_lower: SiteSetting.here_mention).exists? + + @user.has_trust_level_or_staff?(SiteSetting.min_trust_level_for_here_mention) + end + private def is_my_own?(obj) diff --git a/lib/validators/not_username_validator.rb b/lib/validators/not_username_validator.rb new file mode 100644 index 0000000000..d34d4ffed9 --- /dev/null +++ b/lib/validators/not_username_validator.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class NotUsernameValidator + def initialize(opts = {}) + @opts = opts + end + + def valid_value?(val) + val.blank? || !User.where(username: val).exists? + end + + def error_message + I18n.t('site_settings.errors.valid_username') + end +end diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index d7e567a2b5..1ec50a5700 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -3943,4 +3943,44 @@ describe Guardian do end end end + + describe "#can_mention_here?" do + it 'returns false if disabled' do + SiteSetting.max_here_mentioned = 0 + expect(admin.guardian.can_mention_here?).to eq(false) + end + + it 'returns false if disabled' do + SiteSetting.here_mention = '' + expect(admin.guardian.can_mention_here?).to eq(false) + end + + it 'works with trust levels' do + SiteSetting.min_trust_level_for_here_mention = 2 + + expect(trust_level_0.guardian.can_mention_here?).to eq(false) + expect(trust_level_1.guardian.can_mention_here?).to eq(false) + expect(trust_level_2.guardian.can_mention_here?).to eq(true) + expect(trust_level_3.guardian.can_mention_here?).to eq(true) + expect(trust_level_4.guardian.can_mention_here?).to eq(true) + expect(moderator.guardian.can_mention_here?).to eq(true) + expect(admin.guardian.can_mention_here?).to eq(true) + end + + it 'works with staff' do + SiteSetting.min_trust_level_for_here_mention = 'staff' + + expect(trust_level_4.guardian.can_mention_here?).to eq(false) + expect(moderator.guardian.can_mention_here?).to eq(true) + expect(admin.guardian.can_mention_here?).to eq(true) + end + + it 'works with admin' do + SiteSetting.min_trust_level_for_here_mention = 'admin' + + expect(trust_level_4.guardian.can_mention_here?).to eq(false) + expect(moderator.guardian.can_mention_here?).to eq(false) + expect(admin.guardian.can_mention_here?).to eq(true) + end + end end diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb index 84a30aabbc..65c6714bdd 100644 --- a/spec/services/post_alerter_spec.rb +++ b/spec/services/post_alerter_spec.rb @@ -29,6 +29,7 @@ describe PostAlerter do fab!(:evil_trout) { Fabricate(:evil_trout) } fab!(:user) { Fabricate(:user) } + fab!(:tl2_user) { Fabricate(:user, trust_level: TrustLevel[2]) } def create_post_with_alerts(args = {}) post = Fabricate(:post, args) @@ -343,6 +344,53 @@ describe PostAlerter do end end + context '@here' do + let(:topic) { Fabricate(:topic) } + let(:post) { create_post_with_alerts(raw: "Hello @here how are you?", user: tl2_user, topic: topic) } + let(:other_post) { Fabricate(:post, topic: topic) } + + before do + Jobs.run_immediately! + end + + it 'does not notify unrelated users' do + expect { post }.to change(evil_trout.notifications, :count).by(0) + end + + it 'does not work if user here exists' do + Fabricate(:user, username: SiteSetting.here_mention) + expect { post }.to change(other_post.user.notifications, :count).by(0) + end + + it 'notifies users who replied' do + post2 = Fabricate(:post, topic: topic, post_type: Post.types[:whisper]) + post3 = Fabricate(:post, topic: topic) + + expect { post } + .to change(other_post.user.notifications, :count).by(1) + .and change(post2.user.notifications, :count).by(0) + .and change(post3.user.notifications, :count).by(1) + end + + it 'notifies users who whispered' do + post2 = Fabricate(:post, topic: topic, post_type: Post.types[:whisper]) + post3 = Fabricate(:post, topic: topic) + + tl2_user.grant_admin! + + expect { post } + .to change(other_post.user.notifications, :count).by(1) + .and change(post2.user.notifications, :count).by(1) + .and change(post3.user.notifications, :count).by(1) + end + + it 'notifies only last max_here_mentioned users' do + SiteSetting.max_here_mentioned = 2 + 3.times { Fabricate(:post, topic: topic) } + expect { post }.to change { Notification.count }.by(2) + end + end + context '@group mentions' do fab!(:group) { Fabricate(:group, name: 'group', mentionable_level: Group::ALIAS_LEVELS[:everyone]) } From 3172e08b6d17e82c09b4524394ea5e95ee301616 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 23 Nov 2021 23:31:54 +0100 Subject: [PATCH 069/168] DEV: Fix ember-cli proxying to production sites (#15042) --- .../discourse/lib/bootstrap-json/index.js | 204 ++++++++---------- 1 file changed, 91 insertions(+), 113 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js index 6042435728..86f346d34c 100644 --- a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js +++ b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js @@ -1,11 +1,12 @@ "use strict"; +const express = require("express"); const bent = require("bent"); const getJSON = bent("json"); const { encode } = require("html-entities"); const cleanBaseURL = require("clean-base-url"); const path = require("path"); -const fs = require("fs"); +const fs = require("fs/promises"); // via https://stackoverflow.com/a/6248722/165668 function generateUID() { @@ -16,11 +17,6 @@ function generateUID() { return firstPart + secondPart; } -const IGNORE_PATHS = [ - /\/ember-cli-live-reload\.js$/, - /\/session\/[^\/]+\/become$/, -]; - function htmlTag(buffer, bootstrap) { let classList = ""; if (bootstrap.html_classes) { @@ -184,78 +180,80 @@ async function applyBootstrap(bootstrap, template, response, baseURL) { return template; } -function buildFromBootstrap(assetPath, proxy, baseURL, req, response) { - // eslint-disable-next-line - return new Promise((resolve, reject) => { - fs.readFile( - path.join(process.cwd(), "dist", assetPath), - "utf8", - (err, template) => { - let url = `${proxy}${baseURL}bootstrap.json`; - let queryLoc = req.url.indexOf("?"); - if (queryLoc !== -1) { - url += req.url.substr(queryLoc); - } - - getJSON(url, null, req.headers) - .then((json) => { - return applyBootstrap(json.bootstrap, template, response, baseURL); - }) - .then(resolve) - .catch((e) => { - reject( - `Could not get ${proxy}${baseURL}bootstrap.json\n\n${e.toString()}` - ); - }); - } +async function buildFromBootstrap(proxy, baseURL, req, response) { + try { + const template = await fs.readFile( + path.join(process.cwd(), "dist", "index.html"), + "utf8" ); - }); + + let url = `${proxy}${baseURL}bootstrap.json`; + const queryLoc = req.url.indexOf("?"); + if (queryLoc !== -1) { + url += req.url.substr(queryLoc); + } + + const json = await getJSON(url, null, req.headers); + + return applyBootstrap(json.bootstrap, template, response, baseURL); + } catch (error) { + throw new Error( + `Could not get ${proxy}${baseURL}bootstrap.json\n\n${error}` + ); + } } -async function handleRequest(assetPath, proxy, baseURL, req, res) { - if (assetPath.endsWith("tests/index.html")) { - return; +async function handleRequest(proxy, baseURL, req, res) { + const originalHost = req.headers.host; + req.headers.host = new URL(proxy).host; + + if (req.headers["Origin"]) { + req.headers["Origin"] = req.headers["Origin"] + .replace(req.headers.host, originalHost) + .replace(/^https/, "http"); } - if (assetPath.endsWith("index.html")) { - try { - // Avoid Ember CLI's proxy if doing a GET, since Discourse depends on some non-XHR - // GET requests to work. - if (req.method === "GET") { - let url = `${proxy}${req.path}`; + if (req.headers["Referer"]) { + req.headers["Referer"] = req.headers["Referer"] + .replace(req.headers.host, originalHost) + .replace(/^https/, "http"); + } - let queryLoc = req.url.indexOf("?"); - if (queryLoc !== -1) { - url += req.url.substr(queryLoc); - } + let url = `${proxy}${req.path}`; + const queryLoc = req.url.indexOf("?"); + if (queryLoc !== -1) { + url += req.url.substr(queryLoc); + } - req.headers["X-Discourse-Ember-CLI"] = "true"; - let get = bent("GET", [200, 301, 302, 303, 307, 308, 404, 403, 500]); - let response = await get(url, null, req.headers); - res.set(response.headers); - res.set("content-type", "text/html"); - if (response.headers["x-discourse-bootstrap-required"] === "true") { - req.headers["X-Discourse-Asset-Path"] = req.path; - let html = await buildFromBootstrap( - assetPath, - proxy, - baseURL, - req, - response - ); - return res.send(html); - } - res.status(response.status); - res.send(await response.text()); - } - } catch (e) { - res.send(` - -

Discourse Build Error

- 
${e.toString()}
- - `); - } + if (req.method === "GET") { + req.headers["X-Discourse-Ember-CLI"] = "true"; + req.headers["X-Discourse-Asset-Path"] = req.path; + } + + const acceptedStatusCodes = [200, 301, 302, 303, 307, 308, 404, 403, 500]; + const proxyRequest = bent(req.method, acceptedStatusCodes); + const requestBody = req.method === "GET" ? null : req.body; + const response = await proxyRequest(url, requestBody, req.headers); + + res.set(response.headers); + res.set("content-encoding", null); + + const { location } = response.headers; + if (location) { + const newLocation = location + .replace(req.headers.host, originalHost) + .replace(/^https/, "http"); + + res.set("location", newLocation); + } + + if (response.headers["x-discourse-bootstrap-required"] === "true") { + const html = await buildFromBootstrap(proxy, baseURL, req, response); + res.set("content-type", "text/html"); + res.send(html); + } else { + res.status(response.status); + res.send(await response.text()); } } @@ -267,12 +265,11 @@ module.exports = { }, serverMiddleware(config) { - let proxy = config.options.proxy; - let app = config.app; - let options = config.options; + const app = config.app; + let { proxy, rootURL, baseURL } = config.options; if (!proxy) { - // eslint-disable-next-line + // eslint-disable-next-line no-console console.error(` Discourse can't be run without a \`--proxy\` setting, because it needs a Rails application to serve API requests. For example: @@ -281,31 +278,20 @@ to serve API requests. For example: throw "--proxy argument is required"; } - let watcher = options.watcher; + baseURL = rootURL === "" ? "/" : cleanBaseURL(rootURL || baseURL); - let baseURL = - options.rootURL === "" - ? "/" - : cleanBaseURL(options.rootURL || options.baseURL); - - app.use(async (req, res, next) => { + app.use(express.raw({ type: "*/*" }), async (req, res, next) => { try { - const results = await watcher; - if (this.shouldHandleRequest(req, options)) { - let assetPath = req.path.slice(baseURL.length); - let isFile = false; - - try { - isFile = fs - .statSync(path.join(results.directory, assetPath)) - .isFile(); - } catch (err) {} - - if (!isFile) { - assetPath = "index.html"; - } - await handleRequest(assetPath, proxy, baseURL, req, res); + if (this.shouldHandleRequest(req)) { + await handleRequest(proxy, baseURL, req, res); } + } catch (error) { + res.send(` + +

Discourse Build Error

+ 
${error}
+ + `); } finally { if (!res.headersSent) { return next(); @@ -314,25 +300,17 @@ to serve API requests. For example: }); }, - shouldHandleRequest(req) { - let acceptHeaders = req.headers.accept || []; - let hasHTMLHeader = acceptHeaders.indexOf("text/html") !== -1; - if (req.method !== "GET") { - return false; - } - if (!hasHTMLHeader) { - return false; + shouldHandleRequest(request) { + if (request.get("Accept")?.includes("text/html")) { + return true; } - if (IGNORE_PATHS.some((ip) => ip.test(req.path))) { - return false; + if ( + request.get("Content-Type")?.includes("application/x-www-form-urlencoded") + ) { + return true; } - if (req.path.endsWith(".json")) { - return false; - } - - let baseURLRegexp = new RegExp(`^/`); - return baseURLRegexp.test(req.path); + return false; }, }; From 1c0dcbfd4754ec9496415f1f196679735e4e4378 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 23 Nov 2021 23:41:49 +0100 Subject: [PATCH 070/168] DEV: Remove `build_test_topic` task (#15068) I don't think anyone is using it anymore --- lib/tasks/build_test_topic.rake | 51 --------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 lib/tasks/build_test_topic.rake diff --git a/lib/tasks/build_test_topic.rake b/lib/tasks/build_test_topic.rake deleted file mode 100644 index 4e34d88216..0000000000 --- a/lib/tasks/build_test_topic.rake +++ /dev/null @@ -1,51 +0,0 @@ -# frozen_string_literal: true - -# Build a test topic full of links to test our replaceState/pushState functionality. - -desc 'create pushstate/replacestate test topic' -task 'build_test_topic' => :environment do - puts 'Creating topic' - - # Acceptable options: - # - # raw - raw text of post - # image_sizes - We can pass a list of the sizes of images in the post as a shortcut. - # - # When replying to a topic: - # topic_id - topic we're replying to - # reply_to_post_number - post number we're replying to - # - # When creating a topic: - # title - New topic title - # archetype - Topic archetype - # category - Category to assign to topic - # target_usernames - comma delimited list of usernames for membership (private message) - # meta_data - Topic meta data hash - evil_trout = User.find_by_username('EvilTrout') - - first_post = PostCreator.new(evil_trout, raw: "This is the original post.", title: "pushState/replaceState test topic").create - topic = first_post.topic - - topic_url = "#{Discourse.base_url}/t/#{Slug.for(topic.title)}/#{topic.id}" - - 99.times do |i| - post_number = (i + 2) - - links = [] - [-30, -10, 10, 30].each do |offset| - where = (post_number + offset) - if where >= (1) && where <= (100) - links << "Link to ##{where}: #{topic_url}/#{where}" - end - end - - raw = < Date: Tue, 23 Nov 2021 23:42:24 +0100 Subject: [PATCH 071/168] DEV: Remove unnecessary requires (#15067) `auth/*` one was causing warnings (the file was loaded twice) and `sha1` isn't used anymore here --- lib/discourse.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/discourse.rb b/lib/discourse.rb index dd599d1730..66ea0b73f3 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -3,11 +3,8 @@ require 'cache' require 'open3' -require_dependency 'route_format' require_dependency 'plugin/instance' -require_dependency 'auth/default_current_user_provider' require_dependency 'version' -require 'digest/sha1' module Discourse DB_POST_MIGRATE_PATH ||= "db/post_migrate" From 44be79f095268bfe11856ee4132197a6ab595fe0 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Wed, 24 Nov 2021 10:54:01 +1000 Subject: [PATCH 072/168] FIX: Strip Auto-Submitted email header from group SMTP emails (#15057) Remove Auto-Submitted header for group private message emails, it does not make sense there and may hurt deliverability. From https://www.iana.org/assignments/auto-submitted-keywords/auto-submitted-keywords.xhtml: > Indicates that a message was generated by an automatic process, and is not a direct response to another message. --- lib/email/sender.rb | 13 ++++++++++++- spec/components/email/sender_spec.rb | 7 +++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/email/sender.rb b/lib/email/sender.rb index f6547a42a3..cf2c98b2c0 100644 --- a/lib/email/sender.rb +++ b/lib/email/sender.rb @@ -213,9 +213,20 @@ module Email @message.header[Email::MessageBuilder::ALLOW_REPLY_BY_EMAIL_HEADER] = nil end - # Replace reply_key in custom headers or remove MessageBuilder.custom_headers(SiteSetting.email_custom_headers).each do |key, _| value = header_value(key) + + # Remove Auto-Submitted header for group private message emails, it does + # not make sense there and may hurt deliverability. + # + # From https://www.iana.org/assignments/auto-submitted-keywords/auto-submitted-keywords.xhtml: + # + # > Indicates that a message was generated by an automatic process, and is not a direct response to another message. + if key.downcase == "auto-submitted" && smtp_group_id + @message.header[key] = nil + end + + # Replace reply_key in custom headers or remove if value&.include?('%{reply_key}') # Delete old header first or else the same header will be added twice @message.header[key] = nil diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb index 783b70c050..eedb7e8ef4 100644 --- a/spec/components/email/sender_spec.rb +++ b/spec/components/email/sender_spec.rb @@ -414,6 +414,13 @@ describe Email::Sender do expect(message.header['Precedence']).to eq(nil) expect(message.header['List-Unsubscribe']).to eq(nil) end + + it "removes the Auto-Submitted header" do + TopicAllowedGroup.create!(topic: post.topic, group: group) + email_sender.send + + expect(message.header['Auto-Submitted']).to eq(nil) + end end end From 057ef55684b8712966d0d4c6eb19f383b5a22ffd Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Wed, 24 Nov 2021 13:26:52 +0800 Subject: [PATCH 073/168] DEV: Allow callback to be registered to remove post menu button. (#15061) This will allow buttons in the post menu to be remove based on a post's attributes or site settings. --- .../discourse/app/lib/plugin-api.js | 14 ++++- .../discourse/app/widgets/post-menu.js | 52 ++++++++++++---- .../integration/widgets/post-menu-test.js | 59 ++++++++++++++++--- 3 files changed, 100 insertions(+), 25 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js index 6b16d724d7..e869e47daa 100644 --- a/app/assets/javascripts/discourse/app/lib/plugin-api.js +++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js @@ -94,7 +94,7 @@ import { CUSTOM_USER_SEARCH_OPTIONS } from "select-kit/components/user-chooser"; import { downloadCalendar } from "discourse/lib/download-calendar"; // If you add any methods to the API ensure you bump up this number -const PLUGIN_API_VERSION = "0.13.1"; +const PLUGIN_API_VERSION = "0.14.0"; // This helper prevents us from applying the same `modifyClass` over and over in test mode. function canModify(klass, type, resolverName, changes) { @@ -490,9 +490,17 @@ class PluginApi { * ``` * api.removePostMenuButton('like'); * ``` + * + * ``` + * api.removePostMenuButton('like', (attrs, state, siteSettings, settings, currentUser) => { + * if (attrs.post_number === 1) { + * return true; + * } + * }); + * ``` **/ - removePostMenuButton(name) { - removeButton(name); + removePostMenuButton(name, callback) { + removeButton(name, callback); } /** diff --git a/app/assets/javascripts/discourse/app/widgets/post-menu.js b/app/assets/javascripts/discourse/app/widgets/post-menu.js index fcbb4263b8..63c76f053a 100644 --- a/app/assets/javascripts/discourse/app/widgets/post-menu.js +++ b/app/assets/javascripts/discourse/app/widgets/post-menu.js @@ -10,27 +10,27 @@ const LIKE_ACTION = 2; const VIBRATE_DURATION = 5; const _builders = {}; -const _extraButtons = {}; +let _extraButtons = {}; export let apiExtraButtons = {}; +let _buttonsToRemove = {}; export function addButton(name, builder) { _extraButtons[name] = builder; } export function resetPostMenuExtraButtons() { - Object.keys(apiExtraButtons).forEach((button) => { - removeButton(button); - }); - + _buttonsToRemove = {}; apiExtraButtons = {}; + _extraButtons = {}; } -export function removeButton(name) { - if (_extraButtons[name]) { - delete _extraButtons[name]; - } - if (_builders[name]) { - delete _builders[name]; +export function removeButton(name, callback) { + if (callback) { + _buttonsToRemove[name] = callback; + } else { + _buttonsToRemove[name] = () => { + return true; + }; } } @@ -40,8 +40,22 @@ function registerButton(name, builder) { export function buildButton(name, widget) { let { attrs, state, siteSettings, settings, currentUser } = widget; + + let shouldAddButton = true; + + if (_buttonsToRemove[name]) { + shouldAddButton = !_buttonsToRemove[name]( + attrs, + state, + siteSettings, + settings, + currentUser + ); + } + let builder = _builders[name]; - if (builder) { + + if (shouldAddButton && builder) { let button = builder(attrs, state, siteSettings, settings, currentUser); if (button && !button.id) { button.id = name; @@ -498,7 +512,19 @@ export default createWidget("post-menu", { } Object.values(_extraButtons).forEach((builder) => { - if (builder) { + let shouldAddButton = true; + + if (_buttonsToRemove[name]) { + shouldAddButton = !_buttonsToRemove[name]( + attrs, + this.state, + this.siteSettings, + this.settings, + this.currentUser + ); + } + + if (shouldAddButton && builder) { const buttonAtts = builder( attrs, this.state, diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js index 1458fa9cf7..3cd9961d0d 100644 --- a/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js +++ b/app/assets/javascripts/discourse/tests/integration/widgets/post-menu-test.js @@ -7,18 +7,23 @@ import { exists, } from "discourse/tests/helpers/qunit-helpers"; import hbs from "htmlbars-inline-precompile"; +import { resetPostMenuExtraButtons } from "discourse/widgets/post-menu"; import { withPluginApi } from "discourse/lib/plugin-api"; discourseModule( "Integration | Component | Widget | post-menu", function (hooks) { + hooks.afterEach(() => { + resetPostMenuExtraButtons(); + }); + setupRenderingTest(hooks); componentTest("add extra button", { template: hbs`{{mount-widget widget="post-menu" args=args}}`, beforeEach() { this.set("args", {}); - withPluginApi("0.8", (api) => { + withPluginApi("0.14.0", (api) => { api.addPostMenuButton("coffee", () => { return { action: "drinkCoffee", @@ -30,6 +35,7 @@ discourseModule( }); }); }, + async test(assert) { assert.strictEqual( count(".actions .extra-buttons .hot-coffee"), @@ -39,19 +45,54 @@ discourseModule( }, }); - componentTest("remove extra button", { + componentTest("removes button based on callback", { template: hbs`{{mount-widget widget="post-menu" args=args}}`, + beforeEach() { - this.set("args", {}); - withPluginApi("0.8", (api) => { - api.removePostMenuButton("coffee"); + this.set("args", { canCreatePost: true, canRemoveReply: true }); + + withPluginApi("0.14.0", (api) => { + api.removePostMenuButton("reply", (attrs) => { + return attrs.canRemoveReply; + }); }); }, + async test(assert) { - assert.ok( - !exists(".actions .extra-buttons .hot-coffee"), - "It doesn't removes coffee button" - ); + assert.ok(!exists(".actions .reply"), "it removes reply button"); + }, + }); + + componentTest("does not remove butto", { + template: hbs`{{mount-widget widget="post-menu" args=args}}`, + + beforeEach() { + this.set("args", { canCreatePost: true, canRemoveReply: false }); + + withPluginApi("0.14.0", (api) => { + api.removePostMenuButton("reply", (attrs) => { + return attrs.canRemoveReply; + }); + }); + }, + + async test(assert) { + assert.ok(exists(".actions .reply"), "it does not remove reply button"); + }, + }); + + componentTest("removes button", { + template: hbs`{{mount-widget widget="post-menu" args=args}}`, + beforeEach() { + this.set("args", { canCreatePost: true }); + + withPluginApi("0.14.0", (api) => { + api.removePostMenuButton("reply"); + }); + }, + + async test(assert) { + assert.ok(!exists(".actions .reply"), "it removes reply button"); }, }); } From a6aff40e4bdab43946265b9e0961efb5ea109372 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Wed, 24 Nov 2021 16:40:58 +0800 Subject: [PATCH 074/168] DEV: Allow default scope to be configurable per topic. (#15018) Not exposing this as a plugin API yet as we're testing it out with a plugin. --- lib/topic_view.rb | 37 ++++++++++++++++++++++++++---- spec/components/topic_view_spec.rb | 23 +++++++++++++++++++ 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/lib/topic_view.rb b/lib/topic_view.rb index 184b11372e..d5014768ef 100644 --- a/lib/topic_view.rb +++ b/lib/topic_view.rb @@ -79,6 +79,25 @@ class TopicView @custom_filters || {} end + # Configure a default scope to be applied to @filtered_posts. + # The registered block is called with @filtered_posts and an instance of + # `TopicView`. + # + # This API should be considered experimental until it is exposed in + # `Plugin::Instance`. + def self.apply_custom_default_scope(&block) + custom_default_scopes << block + end + + def self.custom_default_scopes + @custom_default_scopes ||= [] + end + + # For testing + def self.reset_custom_default_scopes + @custom_default_scopes = nil + end + def initialize(topic_or_topic_id, user = nil, options = {}) @topic = find_topic(topic_or_topic_id) @user = user @@ -108,7 +127,7 @@ class TopicView @page = @page.to_i > 1 ? @page.to_i : calculate_page setup_filtered_posts - @filtered_posts = apply_default_order(@filtered_posts) + @filtered_posts = apply_default_scope(@filtered_posts) filter_posts(options) if @posts && !@skip_custom_fields @@ -160,7 +179,7 @@ class TopicView if is_mega_topic? nil else - Gaps.new(filtered_post_ids, apply_default_order(unfiltered_posts).pluck(:id)) + Gaps.new(filtered_post_ids, apply_default_scope(unfiltered_posts).pluck(:id)) end end end @@ -287,8 +306,10 @@ class TopicView elsif opts[:post_ids].present? filter_posts_by_ids(opts[:post_ids]) elsif opts[:filter_post_number].present? + # Only used for megatopics where we do not load the entire post stream filter_posts_by_post_number(opts[:filter_post_number], opts[:asc]) elsif opts[:best].present? + # Only used for wordpress filter_best(opts[:best], opts) else filter_posts_paged(@page) @@ -738,7 +759,7 @@ class TopicView :image_upload ) - @posts = apply_default_order(@posts) + @posts = apply_default_scope(@posts) @posts = filter_post_types(@posts) @posts = @posts.with_deleted if @guardian.can_see_deleted_posts?(@topic.category) @posts @@ -762,8 +783,14 @@ class TopicView result end - def apply_default_order(scope) - scope.order(sort_order: :asc) + def apply_default_scope(scope) + scope = scope.order(sort_order: :asc) + + self.class.custom_default_scopes.each do |block| + scope = block.call(scope, self) + end + + scope end def setup_filtered_posts diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb index fb1260fefd..755247d2cf 100644 --- a/spec/components/topic_view_spec.rb +++ b/spec/components/topic_view_spec.rb @@ -968,4 +968,27 @@ describe TopicView do expect(topic_view.reviewable_counts.keys).to contain_exactly(reviewable.target_id) end end + + describe '.apply_custom_default_scope' do + fab!(:post) { Fabricate(:post, topic: topic, created_at: 2.hours.ago) } + fab!(:post_2) { Fabricate(:post, topic: topic, created_at: 1.hour.ago) } + + after do + TopicView.reset_custom_default_scopes + end + + it 'allows a custom default scope to be configured' do + topic_view = TopicView.new(topic, admin) + + expect(topic_view.filtered_post_ids).to eq([post.id, post_2.id]) + + TopicView.apply_custom_default_scope do |scope, _| + scope.unscope(:order).order("posts.created_at DESC") + end + + topic_view = TopicView.new(topic, admin) + + expect(topic_view.filtered_post_ids).to eq([post_2.id, post.id]) + end + end end From 3ea893715726c3516b3b222c77f3cc9d8ee3c1c6 Mon Sep 17 00:00:00 2001 From: Bianca Nenciu Date: Wed, 24 Nov 2021 11:30:06 +0200 Subject: [PATCH 075/168] FEATURE: Add email normalization rules setting (#14593) When this setting is turned on, it will check that normalized emails are unique. Normalized emails are emails without any dots or plus aliases. This setting can be used to block use of aliases of the same email address. --- app/jobs/onceoff/migrate_normalized_emails.rb | 11 +++++++ app/models/user_email.rb | 31 ++++++++++++++----- config/locales/server.en.yml | 1 + config/site_settings.yml | 2 ++ ...2406_add_normalized_email_to_user_email.rb | 13 ++++++++ spec/models/user_email_spec.rb | 26 ++++++++++++++++ 6 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 app/jobs/onceoff/migrate_normalized_emails.rb create mode 100644 db/migrate/20211013092406_add_normalized_email_to_user_email.rb diff --git a/app/jobs/onceoff/migrate_normalized_emails.rb b/app/jobs/onceoff/migrate_normalized_emails.rb new file mode 100644 index 0000000000..4b1ff23c0f --- /dev/null +++ b/app/jobs/onceoff/migrate_normalized_emails.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Jobs + class MigrateNormalizedEmails < ::Jobs::Onceoff + def execute_onceoff(args) + ::UserEmail.find_each do |user_email| + user_email.update(normalized_email: user_email.normalize_email) + end + end + end +end diff --git a/app/models/user_email.rb b/app/models/user_email.rb index 6ab955c95a..4bb2e64e9a 100644 --- a/app/models/user_email.rb +++ b/app/models/user_email.rb @@ -7,6 +7,7 @@ class UserEmail < ActiveRecord::Base attr_accessor :skip_validate_unique_email before_validation :strip_downcase_email + before_validation :normalize_email validates :email, presence: true validates :email, email: true, if: :validate_email? @@ -17,6 +18,14 @@ class UserEmail < ActiveRecord::Base scope :secondary, -> { where(primary: false) } + def normalize_email + self.normalized_email = if self.email.present? + username, domain = self.email.split('@', 2) + username = username.gsub('.', '').gsub(/\+.*/, '') + "#{username}@#{domain}" + end + end + private def strip_downcase_email @@ -37,9 +46,13 @@ class UserEmail < ActiveRecord::Base end def unique_email - if self.class.where("lower(email) = ?", email).exists? - self.errors.add(:email, :taken) + email_exists = if SiteSetting.normalize_emails? + self.class.where("lower(email) = ? OR lower(normalized_email) = ?", email, normalized_email).exists? + else + self.class.where("lower(email) = ?", email).exists? end + + self.errors.add(:email, :taken) if email_exists end def user_id_not_changed @@ -55,16 +68,18 @@ end # # Table name: user_emails # -# id :integer not null, primary key -# user_id :integer not null -# email :string(513) not null -# primary :boolean default(FALSE), not null -# created_at :datetime not null -# updated_at :datetime not null +# id :integer not null, primary key +# user_id :integer not null +# email :string(513) not null +# primary :boolean default(FALSE), not null +# created_at :datetime not null +# updated_at :datetime not null +# normalized_email :string # # Indexes # # index_user_emails_on_email (lower((email)::text)) UNIQUE +# index_user_emails_on_normalized_email (lower((normalized_email)::text)) # index_user_emails_on_user_id (user_id) # index_user_emails_on_user_id_and_primary (user_id,primary) UNIQUE WHERE "primary" # diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 191dcf3f4a..6db14aa86b 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1649,6 +1649,7 @@ en: allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines. In exceptional cases you can permanently override robots.txt." blocked_email_domains: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net" allowed_email_domains: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!" + normalize_emails: "Check if normalized email is unique. Normalized email removes all dots from the username and everything between + and @ symbols." auto_approve_email_domains: "Users with email addresses from this list of domains will be automatically approved." hide_email_address_taken: "Don't inform users that an account exists with a given email address during signup and from the forgot password form." log_out_strict: "When logging out, log out ALL sessions for the user on all devices" diff --git a/config/site_settings.yml b/config/site_settings.yml index 2b31929444..9ea8cf7849 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -510,6 +510,8 @@ login: default: "" type: list list_type: simple + normalize_emails: + default: false auto_approve_email_domains: default: "" type: list diff --git a/db/migrate/20211013092406_add_normalized_email_to_user_email.rb b/db/migrate/20211013092406_add_normalized_email_to_user_email.rb new file mode 100644 index 0000000000..76d022674f --- /dev/null +++ b/db/migrate/20211013092406_add_normalized_email_to_user_email.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class AddNormalizedEmailToUserEmail < ActiveRecord::Migration[6.1] + def change + add_column :user_emails, :normalized_email, :string + execute "CREATE INDEX index_user_emails_on_normalized_email ON user_emails (LOWER(normalized_email))" + end + + def down + execute "DROP INDEX index_user_emails_on_normalized_email" + drop_column :user_emails, :normalized_email, :string + end +end diff --git a/spec/models/user_email_spec.rb b/spec/models/user_email_spec.rb index ac821c7a5d..84440b9ce7 100644 --- a/spec/models/user_email_spec.rb +++ b/spec/models/user_email_spec.rb @@ -26,6 +26,32 @@ describe UserEmail do end end + describe 'normalized_email' do + it 'checks if normalized email is unique' do + SiteSetting.normalize_emails = true + + user_email = user.user_emails.create(email: "a.b+c@example.com", primary: false) + expect(user_email.normalized_email).to eq("ab@example.com") + expect(user_email).to be_valid + + user_email = user.user_emails.create(email: "a.b+d@example.com", primary: false) + expect(user_email.normalized_email).to eq("ab@example.com") + expect(user_email).not_to be_valid + end + + it 'does not check uniqueness if email normalization is not enabled' do + SiteSetting.normalize_emails = false + + user_email = user.user_emails.create(email: "a.b+c@example.com", primary: false) + expect(user_email.normalized_email).to eq("ab@example.com") + expect(user_email).to be_valid + + user_email = user.user_emails.create(email: "a.b+d@example.com", primary: false) + expect(user_email.normalized_email).to eq("ab@example.com") + expect(user_email).to be_valid + end + end + context "indexes" do it "allows only one primary email" do expect { From e217364a46c96240af46cb40da4619b85c370e1a Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 24 Nov 2021 12:52:25 +0100 Subject: [PATCH 076/168] DEV: Fix ember-cli proxy issues (#15071) * DEV: Fix ember-cli proxy compat with node < 16 * DEV: Fix uploading via ember-cli * DEV: Fix proxying /logs & other CSP-enabled pages --- .../discourse/lib/bootstrap-json/index.js | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js index 86f346d34c..8d25e0c03b 100644 --- a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js +++ b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js @@ -6,7 +6,7 @@ const getJSON = bent("json"); const { encode } = require("html-entities"); const cleanBaseURL = require("clean-base-url"); const path = require("path"); -const fs = require("fs/promises"); +const { promises: fs } = require("fs"); // via https://stackoverflow.com/a/6248722/165668 function generateUID() { @@ -240,13 +240,19 @@ async function handleRequest(proxy, baseURL, req, res) { const { location } = response.headers; if (location) { - const newLocation = location - .replace(req.headers.host, originalHost) - .replace(/^https/, "http"); - + const newLocation = location.replace(proxy, `http://${originalHost}`); res.set("location", newLocation); } + const csp = response.headers["content-security-policy"]; + if (csp) { + const newCSP = csp.replace( + new RegExp(proxy, "g"), + `http://${originalHost}` + ); + res.set("content-security-policy", newCSP); + } + if (response.headers["x-discourse-bootstrap-required"] === "true") { const html = await buildFromBootstrap(proxy, baseURL, req, response); res.set("content-type", "text/html"); @@ -280,7 +286,9 @@ to serve API requests. For example: baseURL = rootURL === "" ? "/" : cleanBaseURL(rootURL || baseURL); - app.use(express.raw({ type: "*/*" }), async (req, res, next) => { + const rawMiddleware = express.raw({ type: "*/*", limit: "100mb" }); + + app.use(rawMiddleware, async (req, res, next) => { try { if (this.shouldHandleRequest(req)) { await handleRequest(proxy, baseURL, req, res); @@ -301,12 +309,20 @@ to serve API requests. For example: }, shouldHandleRequest(request) { - if (request.get("Accept")?.includes("text/html")) { + if (request.get("Accept") && request.get("Accept").includes("text/html")) { return true; } if ( - request.get("Content-Type")?.includes("application/x-www-form-urlencoded") + request.get("Content-Type") && + request.get("Content-Type").includes("application/x-www-form-urlencoded") + ) { + return true; + } + + if ( + request.get("Content-Type") && + request.get("Content-Type").includes("multipart/form-data") ) { return true; } From 9105163882247668b321bf6baab960fe1d049a16 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 24 Nov 2021 15:34:04 +0100 Subject: [PATCH 077/168] DEV: Fix the /tests path in ember-cli server (#15075) --- app/assets/javascripts/discourse/lib/bootstrap-json/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js index 8d25e0c03b..1938ddc0f1 100644 --- a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js +++ b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js @@ -309,6 +309,10 @@ to serve API requests. For example: }, shouldHandleRequest(request) { + if (request.path === "/tests/index.html") { + return false; + } + if (request.get("Accept") && request.get("Accept").includes("text/html")) { return true; } From 8c7cc426b7064523925fae817ef9a5a138a63d50 Mon Sep 17 00:00:00 2001 From: janzenisaac <50783505+janzenisaac@users.noreply.github.com> Date: Wed, 24 Nov 2021 09:28:20 -0600 Subject: [PATCH 078/168] FEATURE: Notify responders of post removal (#15049) - Notify users whose posts were cascade deleted due to a flagged post --- config/locales/server.en.yml | 24 +++++++++++++ config/site_settings.yml | 2 ++ lib/post_destroyer.rb | 19 +++++++---- spec/fabricators/reviewable_fabricator.rb | 3 ++ .../reviewable_score_fabricator.rb | 10 ++++++ spec/models/reviewable_flagged_post_spec.rb | 21 +++++++++--- .../topic_view_posts_serializer_spec.rb | 34 +++++++------------ 7 files changed, 80 insertions(+), 33 deletions(-) create mode 100644 spec/fabricators/reviewable_score_fabricator.rb diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 6db14aa86b..c090367f9e 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1498,6 +1498,7 @@ en: tl2_post_edit_time_limit: "A tl2+ author can edit their post for (n) minutes after posting. Set to 0 for forever." edit_history_visible_to_public: "Allow everyone to see previous versions of an edited post. When disabled, only staff members can view." delete_removed_posts_after: "Posts removed by the author will be automatically deleted after (n) hours. If set to 0, posts will be deleted immediately." + notify_users_after_responses_deleted_on_flagged_post: "When a post is flagged and then removed, all users that responded to the post and had their responses removed will be notified." max_image_width: "Maximum thumbnail width of images in a post" max_image_height: "Maximum thumbnail height of images in a post" responsive_post_image_sizes: "Resize lightbox preview images to allow for high DPI screens of the following pixel ratios. Remove all values to disable responsive images." @@ -2791,6 +2792,11 @@ en: inappropriate: "Your post was flagged as **inappropriate**: the community feels it is offensive, abusive, or a violation of [our community guidelines](%{base_path}/guidelines)." spam: "Your post was flagged as **spam**: the community feels it is an advertisement, something that is overly promotional in nature instead of being useful or relevant to the topic as expected." notify_moderators: "Your post was flagged **for moderator attention**: the community feels something about the post requires manual intervention by a staff member." + responder: + off_topic: "The post was flagged as **off-topic**: the community feels it is not a good fit for the topic, as currently defined by the title and the first post." + inappropriate: "The post was flagged as **inappropriate**: the community feels it is offensive, abusive, or a violation of [our community guidelines](%{base_path}/guidelines)." + spam: "The post was flagged as **spam**: the community feels it is an advertisement, something that is overly promotional in nature instead of being useful or relevant to the topic as expected." + notify_moderators: "The post was flagged **for moderator attention**: the community feels something about the post requires manual intervention by a staff member." flags_dispositions: agreed: "Thanks for letting us know. We agree there is an issue and we're looking into it." @@ -2889,6 +2895,24 @@ en: Please review our [community guidelines](%{base_url}/guidelines) for details. + flags_agreed_and_post_deleted_for_responders: + title: "Reply removed from flagged post by staff" + subject_template: "Reply removed from flagged post by staff" + text_body_template: | + Hello, + + This is an automated message from %{site_name} to let you know that a [post](%{base_url}%{url}) you replied to was removed. + + %{flag_reason} + + This post was flagged by the community and a staff member opted to remove it. + + ``` markdown + %{flagged_post_raw_content} + ``` + + For more details on the reason for removal, please review our [community guidelines](%{base_url}/guidelines). + usage_tips: text_body_template: | For a few quick tips on getting started as a new user, [check out this blog post](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/). diff --git a/config/site_settings.yml b/config/site_settings.yml index 9ea8cf7849..508981517d 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -828,6 +828,8 @@ posting: delete_removed_posts_after: client: true default: 24 + notify_users_after_responses_deleted_on_flagged_post: + default: false traditional_markdown_linebreaks: client: true default: false diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb index 9d09c7ee32..427fd6f08d 100644 --- a/lib/post_destroyer.rb +++ b/lib/post_destroyer.rb @@ -43,7 +43,10 @@ class PostDestroyer reply_ids = post.reply_ids(Guardian.new(performed_by), only_replies_to_single_post: false) replies = Post.where(id: reply_ids.map { |r| r[:id] }) PostDestroyer.new(performed_by, post, reviewable: reviewable).destroy - replies.each { |reply| PostDestroyer.new(performed_by, reply, defer_flags: defer_reply_flags).destroy } + + options = { defer_flags: defer_reply_flags } + options.merge!({ reviewable: reviewable, notify_responders: true, parent_post: post }) if SiteSetting.notify_users_after_responses_deleted_on_flagged_post + replies.each { |reply| PostDestroyer.new(performed_by, reply, options).destroy } end def initialize(user, post, opts = {}) @@ -179,7 +182,7 @@ class PostDestroyer DB.after_commit do if @opts[:reviewable] - notify_deletion(@opts[:reviewable]) + notify_deletion(@opts[:reviewable], { notify_responders: @opts[:notify_responders], parent_post: @opts[:parent_post] }) elsif reviewable = @post.reviewable_flag @opts[:defer_flags] ? ignore(reviewable) : agree(reviewable) end @@ -315,21 +318,23 @@ class PostDestroyer reviewable.transition_to(:ignored, @user) end - def notify_deletion(reviewable) + def notify_deletion(reviewable, options = {}) return if @post.user.blank? allowed_user = @user.human? && @user.staff? return unless allowed_user && rs = reviewable.reviewable_scores.order('created_at DESC').first + notify_responders = options[:notify_responders] + Jobs.enqueue( :send_system_message, user_id: @post.user_id, - message_type: :flags_agreed_and_post_deleted, + message_type: notify_responders ? :flags_agreed_and_post_deleted_for_responders : :flags_agreed_and_post_deleted, message_options: { - flagged_post_raw_content: @post.raw, - url: @post.url, + flagged_post_raw_content: notify_responders ? options[:parent_post].raw : @post.raw, + url: notify_responders ? options[:parent_post].url : @post.url, flag_reason: I18n.t( - "flag_reasons.#{PostActionType.types[rs.reviewable_score_type]}", + "flag_reasons#{".responder" if notify_responders}.#{PostActionType.types[rs.reviewable_score_type]}", locale: SiteSetting.default_locale, base_path: Discourse.base_path ) diff --git a/spec/fabricators/reviewable_fabricator.rb b/spec/fabricators/reviewable_fabricator.rb index bbf825d105..b2f2612040 100644 --- a/spec/fabricators/reviewable_fabricator.rb +++ b/spec/fabricators/reviewable_fabricator.rb @@ -57,6 +57,9 @@ Fabricator(:reviewable_flagged_post) do topic target_type 'Post' target { Fabricate(:post) } + reviewable_scores { |p| [ + Fabricate.build(:reviewable_score, reviewable_id: p[:id]), + ]} end Fabricator(:reviewable_user) do diff --git a/spec/fabricators/reviewable_score_fabricator.rb b/spec/fabricators/reviewable_score_fabricator.rb new file mode 100644 index 0000000000..81e781baae --- /dev/null +++ b/spec/fabricators/reviewable_score_fabricator.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +Fabricator(:reviewable_score) do + reviewable { Fabricate(:reviewable) } + user { Fabricate(:user) } + reviewable_score_type { 4 } + status { 1 } + score { 11.0 } + reviewed_by { Fabricate(:user) } +end diff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rb index 8b36f825ca..f322024d84 100644 --- a/spec/models/reviewable_flagged_post_spec.rb +++ b/spec/models/reviewable_flagged_post_spec.rb @@ -283,16 +283,27 @@ RSpec.describe ReviewableFlaggedPost, type: :model do end describe "#perform_delete_and_agree_replies" do - it 'ignore flagged replies' do - flagged_post = Fabricate(:reviewable_flagged_post) - reply = create_reply(flagged_post.target) - flagged_post.target.update(reply_count: 1) - flagged_reply = Fabricate(:reviewable_flagged_post, target: reply) + let(:flagged_post) { Fabricate(:reviewable_flagged_post) } + let!(:reply) { create_reply(flagged_post.target) } + before do + flagged_post.target.update(reply_count: 1) + end + + it 'ignore flagged replies' do + flagged_reply = Fabricate(:reviewable_flagged_post, target: reply) flagged_post.perform(moderator, :delete_and_agree_replies) expect(flagged_reply.reload.status).to eq(Reviewable.statuses[:ignored]) end + + it 'notifies users that responded to flagged post' do + SiteSetting.notify_users_after_responses_deleted_on_flagged_post = true + flagged_post.perform(moderator, :delete_and_agree_replies) + + expect(Jobs::SendSystemMessage.jobs.size).to eq(2) + expect(Jobs::SendSystemMessage.jobs.last["args"].first["message_type"]).to eq("flags_agreed_and_post_deleted_for_responders") + end end describe "#perform_disagree_and_restore" do diff --git a/spec/serializers/topic_view_posts_serializer_spec.rb b/spec/serializers/topic_view_posts_serializer_spec.rb index 55be89f36d..04c43ffdf1 100644 --- a/spec/serializers/topic_view_posts_serializer_spec.rb +++ b/spec/serializers/topic_view_posts_serializer_spec.rb @@ -4,28 +4,20 @@ require 'rails_helper' describe TopicViewPostsSerializer do + let(:user) { Fabricate(:user) } + let(:post) { Fabricate(:post) } + let(:topic) { post.topic } + let!(:reviewable) { Fabricate(:reviewable_flagged_post, + created_by: user, + target: post, + topic: topic, + reviewable_scores: [ + Fabricate(:reviewable_score, reviewable_score_type: 0, status: ReviewableScore.statuses[:pending]), + Fabricate(:reviewable_score, reviewable_score_type: 0, status: ReviewableScore.statuses[:ignored]) + ] + )} + it 'should return the right attributes' do - - user = Fabricate(:user) - post = Fabricate(:post) - topic = post.topic - - reviewable = Fabricate(:reviewable_flagged_post, created_by: user, target: post, topic: topic) - - ReviewableScore.create!( - reviewable_id: reviewable.id, - user_id: user.id, - reviewable_score_type: 0, - status: ReviewableScore.statuses[:pending] - ) - - ReviewableScore.create!( - reviewable_id: reviewable.id, - user_id: user.id, - reviewable_score_type: 0, - status: ReviewableScore.statuses[:ignored] - ) - topic_view = TopicView.new(topic, user, post_ids: [post.id]) serializer = TopicViewPostsSerializer.new( From 1ab4b1a4a80673982041426fb50a38c229d5c9b5 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 24 Nov 2021 16:43:25 +0100 Subject: [PATCH 079/168] DEV: Minor cleanup of create-account tests (#14989) --- .../app/controllers/create-account.js | 4 ++++ .../unit/controllers/create-account-test.js | 21 +++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/discourse/app/controllers/create-account.js b/app/assets/javascripts/discourse/app/controllers/create-account.js index 02f78f0248..946ffd0288 100644 --- a/app/assets/javascripts/discourse/app/controllers/create-account.js +++ b/app/assets/javascripts/discourse/app/controllers/create-account.js @@ -295,6 +295,10 @@ export default Controller.extend( this._hpPromise = ajax("/session/hp.json") .then((json) => { + if (this.isDestroying || this.isDestroyed) { + return; + } + this._challengeDate = new Date(); // remove 30 seconds for jitter, make sure this works for at least // 30 seconds so we don't have hard loops diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js index a361bf19e7..7d49a9c7f9 100644 --- a/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js +++ b/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js @@ -3,8 +3,8 @@ import { discourseModule } from "discourse/tests/helpers/qunit-helpers"; import { test } from "qunit"; discourseModule("Unit | Controller | create-account", function () { - test("basicUsernameValidation", async function (assert) { - const testInvalidUsername = async (username, expectedReason) => { + test("basicUsernameValidation", function (assert) { + const testInvalidUsername = (username, expectedReason) => { const controller = this.getController("create-account"); controller.set("accountUsername", username); @@ -24,8 +24,7 @@ discourseModule("Unit | Controller | create-account", function () { I18n.t("user.username.too_long") ); - const controller = await this.owner.lookup("controller:create-account"); - controller.setProperties({ + const controller = this.getController("create-account", { accountUsername: "porkchops", prefilledUsername: "porkchops", }); @@ -39,7 +38,7 @@ discourseModule("Unit | Controller | create-account", function () { ); }); - test("passwordValidation", async function (assert) { + test("passwordValidation", function (assert) { const controller = this.getController("create-account"); controller.set("authProvider", ""); @@ -49,12 +48,12 @@ discourseModule("Unit | Controller | create-account", function () { controller.set("accountPassword", "b4fcdae11f9167"); assert.strictEqual( - controller.get("passwordValidation.ok"), + controller.passwordValidation.ok, true, "Password is ok" ); assert.strictEqual( - controller.get("passwordValidation.reason"), + controller.passwordValidation.reason, I18n.t("user.password.ok"), "Password is valid" ); @@ -63,12 +62,12 @@ discourseModule("Unit | Controller | create-account", function () { controller.set("accountPassword", password); assert.strictEqual( - controller.get("passwordValidation.failed"), + controller.passwordValidation.failed, true, "password should be invalid: " + password ); assert.strictEqual( - controller.get("passwordValidation.reason"), + controller.passwordValidation.reason, expectedReason, "password validation reason: " + password + ", " + expectedReason ); @@ -83,8 +82,8 @@ discourseModule("Unit | Controller | create-account", function () { ); }); - test("authProviderDisplayName", async function (assert) { - const controller = this.owner.lookup("controller:create-account"); + test("authProviderDisplayName", function (assert) { + const controller = this.getController("create-account"); assert.strictEqual( controller.authProviderDisplayName("facebook"), From 59e0ed882038a6a2616a6bc5566d2f2c27d5cc2c Mon Sep 17 00:00:00 2001 From: Bianca Nenciu Date: Wed, 24 Nov 2021 18:51:25 +0200 Subject: [PATCH 080/168] FEATURE: Highlight changed tags in post revisions (#15072) --- .../discourse/app/controllers/history.js | 49 ++++++++++----- .../discourse/app/templates/modal/history.hbs | 4 +- .../tests/acceptance/post-history-test.js | 63 +++++++++++++++++++ 3 files changed, 100 insertions(+), 16 deletions(-) create mode 100644 app/assets/javascripts/discourse/tests/acceptance/post-history-test.js diff --git a/app/assets/javascripts/discourse/app/controllers/history.js b/app/assets/javascripts/discourse/app/controllers/history.js index 18e36c478d..4888ce0f30 100644 --- a/app/assets/javascripts/discourse/app/controllers/history.js +++ b/app/assets/javascripts/discourse/app/controllers/history.js @@ -11,21 +11,17 @@ import ModalFunctionality from "discourse/mixins/modal-functionality"; import Post from "discourse/models/post"; import bootbox from "bootbox"; import { categoryBadgeHTML } from "discourse/helpers/category-link"; -import { computed } from "@ember/object"; import { iconHTML } from "discourse-common/lib/icon-library"; import { sanitizeAsync } from "discourse/lib/text"; -function customTagArray(fieldName) { - return computed(fieldName, function () { - let val = this.get(fieldName); - if (!val) { - return val; - } - if (!Array.isArray(val)) { - val = [val]; - } - return val; - }); +function customTagArray(val) { + if (!val) { + return []; + } + if (!Array.isArray(val)) { + val = [val]; + } + return val; } // This controller handles displaying of history @@ -43,8 +39,33 @@ export default Controller.extend(ModalFunctionality, { previousFeaturedLink: alias("model.featured_link_changes.previous"), currentFeaturedLink: alias("model.featured_link_changes.current"), - previousTagChanges: customTagArray("model.tags_changes.previous"), - currentTagChanges: customTagArray("model.tags_changes.current"), + @discourseComputed( + "model.tags_changes.previous", + "model.tags_changes.current" + ) + previousTagChanges(previous, current) { + const previousArray = customTagArray(previous); + const currentSet = new Set(customTagArray(current)); + + return previousArray.map((name) => ({ + name, + deleted: !currentSet.has(name), + })); + }, + + @discourseComputed( + "model.tags_changes.previous", + "model.tags_changes.current" + ) + currentTagChanges(previous, current) { + const previousSet = new Set(customTagArray(previous)); + const currentArray = customTagArray(current); + + return currentArray.map((name) => ({ + name, + inserted: !previousSet.has(name), + })); + }, @discourseComputed("post.version") modalTitleKey(version) { diff --git a/app/assets/javascripts/discourse/app/templates/modal/history.hbs b/app/assets/javascripts/discourse/app/templates/modal/history.hbs index 38d5bed5c2..d47e76e5f6 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/history.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/history.hbs @@ -84,12 +84,12 @@
{{i18n "tagging.changed"}} {{#each previousTagChanges as |t|}} - {{discourse-tag t}} + {{discourse-tag t.name style=(if t.deleted "diff-del")}} {{/each}} →   {{#each currentTagChanges as |t|}} - {{discourse-tag t}} + {{discourse-tag t.name style=(if t.inserted "diff-ins")}} {{/each}}
{{/if}} diff --git a/app/assets/javascripts/discourse/tests/acceptance/post-history-test.js b/app/assets/javascripts/discourse/tests/acceptance/post-history-test.js new file mode 100644 index 0000000000..6167e0ff3a --- /dev/null +++ b/app/assets/javascripts/discourse/tests/acceptance/post-history-test.js @@ -0,0 +1,63 @@ +import { click, visit } from "@ember/test-helpers"; +import { + acceptance, + count, + query, +} from "discourse/tests/helpers/qunit-helpers"; +import { test } from "qunit"; + +acceptance("Post - History", function (needs) { + needs.user(); + + needs.pretender((server, helper) => { + server.get("/posts/419/revisions/latest.json", () => { + return helper.response({ + created_at: "2021-11-24T10:59:36.163Z", + post_id: 419, + previous_hidden: false, + current_hidden: false, + first_revision: 1, + previous_revision: 1, + current_revision: 2, + next_revision: null, + last_revision: 2, + current_version: 2, + version_count: 2, + username: "bianca", + display_username: "bianca", + avatar_template: "/letter_avatar_proxy/v4/letter/b/3be4f8/{size}.png", + edit_reason: null, + body_changes: { + inline: '

Welcome to Discourse!', + side_by_side: + '

Welcome to Discourse!

Welcome to Discourse!', + side_by_side_markdown: + '
Welcome to Discourse!Welcome to Discourse!
', + }, + title_changes: { + inline: + '

Welcome to Discourse!
', + side_by_side: + '
Welcome to Discourse!
Welcome to Discourse!
', + }, + user_changes: null, + tags_changes: { + previous: ["tag1", "tag2"], + current: ["tag2", "tag3"], + }, + wiki: false, + can_edit: true, + }); + }); + }); + + test("Shows highlighted tag changes", async function (assert) { + await visit("/t/internationalization-localization/280"); + await click("article[data-post-id='419'] .edits button"); + assert.equal(count(".discourse-tag"), 4); + assert.equal(count(".discourse-tag.diff-del"), 1); + assert.equal(query(".discourse-tag.diff-del").textContent, "tag1"); + assert.equal(count(".discourse-tag.diff-ins"), 1); + assert.equal(query(".discourse-tag.diff-ins").textContent, "tag3"); + }); +}); From 3f97f884fef9d3e4b33ae6361d7891c3c414802b Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Wed, 24 Nov 2021 19:12:49 +0200 Subject: [PATCH 081/168] DEV: Fail stop if theme update fails (#15074) This applies only when a single site exists. If a theme update fails when there are multiple sites, then it will continue updating the remaining themes. --- lib/tasks/themes.rake | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake index d997d57997..ddc3abb4e3 100644 --- a/lib/tasks/themes.rake +++ b/lib/tasks/themes.rake @@ -52,20 +52,22 @@ task "themes:install" => :environment do |task, args| end end -def update_themes - Theme.where(auto_update: true, enabled: true).find_each do |theme| +def update_themes(fail_stop: true) + Theme.includes(:remote_theme).where(enabled: true, auto_update: true).find_each do |theme| begin - if theme.remote_theme.present? - puts "Updating '#{theme.name}' for '#{RailsMultisite::ConnectionManagement.current_db}'..." - theme.remote_theme.update_from_remote - theme.save! - unless theme.remote_theme.last_error_text.nil? - puts "Error updating '#{theme.name}': #{theme.remote_theme.last_error_text}" - end + next if theme.remote_theme.blank? + + puts "Updating '#{theme.name}' for '#{RailsMultisite::ConnectionManagement.current_db}'..." + theme.remote_theme.update_from_remote + + if theme.remote_theme.last_error_text.present? + puts "Error updating '#{theme.name}': #{theme.remote_theme.last_error_text}" + exit 1 if fail_stop end rescue => e STDERR.puts "Failed to update '#{theme.name}': #{e}" STDERR.puts e.backtrace + exit 1 if fail_stop end end end @@ -76,7 +78,7 @@ task "themes:update" => :environment do update_themes else RailsMultisite::ConnectionManagement.each_connection do - update_themes + update_themes(fail_stop: false) end end end From c75224e3d98caaabf86fab10e5cb70780a05796e Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 24 Nov 2021 18:18:35 +0100 Subject: [PATCH 082/168] DEV: Update supported node versions (#15073) 13 and 15 are no longer supported by node, and issues with discourse dependencies prevent us from using 17. (for now) --- app/assets/javascripts/admin/package.json | 2 +- app/assets/javascripts/discourse-common/package.json | 2 +- app/assets/javascripts/discourse-hbr/package.json | 2 +- app/assets/javascripts/discourse-widget-hbs/package.json | 2 +- .../javascripts/discourse/lib/bootstrap-json/package.json | 2 +- app/assets/javascripts/discourse/package.json | 2 +- app/assets/javascripts/pretty-text/package.json | 2 +- app/assets/javascripts/select-kit/package.json | 2 +- app/assets/javascripts/truth-helpers/package.json | 2 +- bin/ember-cli | 3 +-- package.json | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json index 199c83d4f8..2d26ca55ef 100644 --- a/app/assets/javascripts/admin/package.json +++ b/app/assets/javascripts/admin/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json index 61de38645e..f804413fd2 100644 --- a/app/assets/javascripts/discourse-common/package.json +++ b/app/assets/javascripts/discourse-common/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-hbr/package.json b/app/assets/javascripts/discourse-hbr/package.json index f443450f2a..41517f42de 100644 --- a/app/assets/javascripts/discourse-hbr/package.json +++ b/app/assets/javascripts/discourse-hbr/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-widget-hbs/package.json b/app/assets/javascripts/discourse-widget-hbs/package.json index 4787f2640a..fae0916093 100644 --- a/app/assets/javascripts/discourse-widget-hbs/package.json +++ b/app/assets/javascripts/discourse-widget-hbs/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/package.json b/app/assets/javascripts/discourse/lib/bootstrap-json/package.json index 50d5b34ef2..5c86ee721a 100644 --- a/app/assets/javascripts/discourse/lib/bootstrap-json/package.json +++ b/app/assets/javascripts/discourse/lib/bootstrap-json/package.json @@ -11,7 +11,7 @@ ] }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" } diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index 9bfd19569b..550b1594f5 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -66,7 +66,7 @@ "virtual-dom": "^2.1.1" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json index f2823ac6fa..1ec1e8c21b 100644 --- a/app/assets/javascripts/pretty-text/package.json +++ b/app/assets/javascripts/pretty-text/package.json @@ -45,7 +45,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json index 67f0723434..3dd5bf0f1e 100644 --- a/app/assets/javascripts/select-kit/package.json +++ b/app/assets/javascripts/select-kit/package.json @@ -44,7 +44,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/truth-helpers/package.json b/app/assets/javascripts/truth-helpers/package.json index 68668bf329..36d50100c2 100644 --- a/app/assets/javascripts/truth-helpers/package.json +++ b/app/assets/javascripts/truth-helpers/package.json @@ -44,7 +44,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/bin/ember-cli b/bin/ember-cli index a646b63970..713876680f 100755 --- a/bin/ember-cli +++ b/bin/ember-cli @@ -46,7 +46,7 @@ if !args.include?("test") && !args.include?("--proxy") args << PROXY end -system "yarn -s install --cwd #{yarn_dir}" +exit 1 if !system "yarn -s install --cwd #{yarn_dir}" if ARGV.include?("-u") || ARGV.include?("--unicorn") unicorn_env = { "DISCOURSE_PORT" => ENV["DISCOURSE_PORT"] || "4200" } @@ -72,7 +72,6 @@ if ARGV.include?("-u") || ARGV.include?("--unicorn") end Process.wait(unicorn_pid) - else exec "yarn", *args.to_a.flatten end diff --git a/package.json b/package.json index 316c1f6565..ac6869dd30 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "postinstall": "yarn --cwd app/assets/javascripts/discourse" }, "engines": { - "node": ">= 12.*", + "node": "12.* || 14.* || 16.*", "npm": "please-use-yarn", "yarn": ">= 1.21.1" } From 0009498901ee43bd9b7c7ca6d3c4f1e93628a164 Mon Sep 17 00:00:00 2001 From: Kerry Liu Date: Thu, 18 Nov 2021 08:54:26 -0800 Subject: [PATCH 083/168] UX: pasting links on a selection will apply a link format --- .../app/mixins/textarea-text-manipulation.js | 16 ++++++- .../integration/components/d-editor-test.js | 44 ++++++++++++++++++- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js b/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js index 02563526b1..7e59a34d9d 100644 --- a/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js +++ b/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js @@ -242,7 +242,8 @@ export default Mixin.create({ let html = clipboard.getData("text/html"); let handled = false; - const { pre, lineVal } = this._getSelected(null, { lineVal: true }); + const selected = this._getSelected(null, { lineVal: true }); + const { pre, value: selectedValue, lineVal } = selected; const isInlinePasting = pre.match(/[^\n]$/); const isCodeBlock = isInside(pre, /(^|\n)```/g); @@ -272,6 +273,19 @@ export default Mixin.create({ } } + if (plainText && !handled && selected.end > selected.start) { + let isURL; + try { + isURL = !!new URL(plainText); + } catch { + isURL = false; + } + if (isURL) { + this._addText(selected, `[${selectedValue}](${plainText})`); + handled = true; + } + } + if (canPasteHtml && !handled) { let markdown = toMarkdown(html); diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js index aa37f57817..3b090b1bb0 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js @@ -729,10 +729,11 @@ third line` }); async function paste(element, text) { - let e = new Event("paste"); + let e = new Event("paste", { cancelable: true }); e.clipboardData = { getData: () => text }; element.dispatchEvent(e); await settled(); + return e; } componentTest("paste table", { @@ -763,6 +764,47 @@ third line` }, }); + testCase( + `pasting a link into a selection applies a link format`, + async function (assert, textarea) { + this.set("value", "See discourse in action"); + setTextareaSelection(textarea, 4, 13); + const element = query(".d-editor"); + const event = await paste(element, "https://www.discourse.org/"); + assert.strictEqual( + this.value, + "See [discourse](https://www.discourse.org/) in action" + ); + assert.strictEqual(event.defaultPrevented, true); + } + ); + + testCase( + `pasting other text into a selection will replace text value`, + async function (assert, textarea) { + this.set("value", "good morning"); + setTextareaSelection(textarea, 5, 12); + const element = query(".d-editor"); + const event = await paste(element, "evening"); + // Synthetic paste events do not manipulate document content. + assert.strictEqual(this.value, "good morning"); + assert.strictEqual(event.defaultPrevented, false); + } + ); + + testCase( + `pasting a url without a selection will insert the url`, + async function (assert, textarea) { + this.set("value", "a link example:"); + jumpEnd(textarea); + const element = query(".d-editor"); + const event = await paste(element, "https://www.discourse.org/"); + // Synthetic paste events do not manipulate document content. + assert.strictEqual(this.value, "a link example:"); + assert.strictEqual(event.defaultPrevented, false); + } + ); + (() => { // Tests to check cursor/selection after replace-text event. const BEFORE = "red green blue"; From f37bffdf6cd2f14070005c860c7ba9a22b42e302 Mon Sep 17 00:00:00 2001 From: Kerry Liu Date: Mon, 22 Nov 2021 16:15:46 -0800 Subject: [PATCH 084/168] UX: when pasting a link use linkify rules --- .../javascripts/discourse/app/lib/text.js | 7 ++++ .../app/mixins/textarea-text-manipulation.js | 35 +++++++++++++------ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/text.js b/app/assets/javascripts/discourse/app/lib/text.js index ea40982c6c..6e7def0ecd 100644 --- a/app/assets/javascripts/discourse/app/lib/text.js +++ b/app/assets/javascripts/discourse/app/lib/text.js @@ -50,6 +50,13 @@ export function generateCookFunction(options) { }); } +export function generateLinkifyFunction(options) { + return loadMarkdownIt().then(() => { + const prettyText = createPrettyText(options); + return prettyText.opts.engine.linkify; + }); +} + export function sanitize(text, options) { return textSanitize(text, new AllowLister(options)); } diff --git a/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js b/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js index 7e59a34d9d..81610c35ba 100644 --- a/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js +++ b/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js @@ -1,5 +1,6 @@ import { bind } from "discourse-common/utils/decorators"; import Mixin from "@ember/object/mixin"; +import { generateLinkifyFunction } from "discourse/lib/text"; import toMarkdown from "discourse/lib/to-markdown"; import { action } from "@ember/object"; import { isEmpty } from "@ember/utils"; @@ -17,6 +18,14 @@ const isInside = (text, regex) => { }; export default Mixin.create({ + init() { + this._super(...arguments); + generateLinkifyFunction(this.markdownOptions || {}).then((linkify) => { + // When pasting links, we should use the same rules to match links as we do when creating links for a cooked post. + this._cachedLinkify = linkify; + }); + }, + // ensures textarea scroll position is correct _focusTextArea() { schedule("afterRender", () => { @@ -273,16 +282,22 @@ export default Mixin.create({ } } - if (plainText && !handled && selected.end > selected.start) { - let isURL; - try { - isURL = !!new URL(plainText); - } catch { - isURL = false; - } - if (isURL) { - this._addText(selected, `[${selectedValue}](${plainText})`); - handled = true; + if ( + this._cachedLinkify && + plainText && + !handled && + selected.end > selected.start + ) { + if (this._cachedLinkify.test(plainText)) { + const match = this._cachedLinkify.match(plainText)[0]; + if ( + match && + match.index === 0 && + match.lastIndex === match.raw.length + ) { + this._addText(selected, `[${selectedValue}](${match.url})`); + handled = true; + } } } From ded9fe950a1f9b1570c172fe583a6b96a31444c5 Mon Sep 17 00:00:00 2001 From: Kerry Liu Date: Tue, 23 Nov 2021 15:11:22 -0800 Subject: [PATCH 085/168] UX: add additional tests for pasting a link on a selection --- .../app/mixins/textarea-text-manipulation.js | 2 ++ .../integration/components/d-editor-test.js | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js b/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js index 81610c35ba..aab066c61b 100644 --- a/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js +++ b/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js @@ -295,6 +295,8 @@ export default Mixin.create({ match.index === 0 && match.lastIndex === match.raw.length ) { + // When specified, linkify supports fuzzy links and emails. Prefer providing the protocol. + // eg: pasting "example@discourse.org" may apply a link format of "mailto:example@discourse.org" this._addText(selected, `[${selectedValue}](${match.url})`); handled = true; } diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js index 3b090b1bb0..aa0808ed86 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js @@ -805,6 +805,34 @@ third line` } ); + testCase( + `pasting text that contains urls and other content will use default paste behavior`, + async function (assert, textarea) { + this.set("value", "a link example:"); + setTextareaSelection(textarea, 0, 1); + const element = query(".d-editor"); + const event = await paste( + element, + "Try out Discourse at: https://www.discourse.org/" + ); + // Synthetic paste events do not manipulate document content. + assert.strictEqual(this.value, "a link example:"); + assert.strictEqual(event.defaultPrevented, false); + } + ); + + testCase( + `pasting an email into a selection applies a link format`, + async function (assert, textarea) { + this.set("value", "team email"); + setTextareaSelection(textarea, 5, 10); + const element = query(".d-editor"); + const event = await paste(element, "mailto:team@discourse.org"); + assert.strictEqual(this.value, "team [email](mailto:team@discourse.org)"); + assert.strictEqual(event.defaultPrevented, true); + } + ); + (() => { // Tests to check cursor/selection after replace-text event. const BEFORE = "red green blue"; From 8fd10e6414cf4eabdb28d2c5bde8a5b25ea4a4df Mon Sep 17 00:00:00 2001 From: Osama Sayegh Date: Wed, 24 Nov 2021 20:44:46 +0300 Subject: [PATCH 086/168] FIX: Don't crash the browser when tapping autocomplete suggestions on Android/Gboard (#15076) This is a workaround for an annoying bug that crashes the browser when an autocomplete suggestion is selected on Android if the virtual keyboard is Gboard. It's specific to Gboard because it sometimes sends `keydown` and `keyup` events twice for a single key press, more details can be found here: https://meta.discourse.org/t/emoji-selector-crashes-the-message-editor-in-android-chrome/187009/24?u=osama. --- .../discourse/app/lib/autocomplete.js | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/autocomplete.js b/app/assets/javascripts/discourse/app/lib/autocomplete.js index 5645050878..38ab5601e0 100644 --- a/app/assets/javascripts/discourse/app/lib/autocomplete.js +++ b/app/assets/javascripts/discourse/app/lib/autocomplete.js @@ -309,9 +309,22 @@ export default function (options) { } ul.find("li").click(function () { selectedOption = ul.find("li").index(this); - completeTerm(autocompleteOptions[selectedOption]); - if (!options.single) { - me.focus(); + // hack for Gboard, see meta.discourse.org/t/-/187009/24 + if (autocompleteOptions == null) { + const opts = { ...options, _gboard_hack_force_lookup: true }; + const forcedAutocompleteOptions = dataSource(prevTerm, opts); + forcedAutocompleteOptions?.then((data) => { + updateAutoComplete(data); + completeTerm(autocompleteOptions[selectedOption]); + if (!options.single) { + me.focus(); + } + }); + } else { + completeTerm(autocompleteOptions[selectedOption]); + if (!options.single) { + me.focus(); + } } return false; }); @@ -398,7 +411,11 @@ export default function (options) { } function dataSource(term, opts) { - if (prevTerm === term) { + const force = opts._gboard_hack_force_lookup; + if (force) { + delete opts._gboard_hack_force_lookup; + } + if (prevTerm === term && !force) { return SKIP; } From 9380c1273edd2f13434fadc2c9e853b5fa2881fa Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 24 Nov 2021 18:54:15 +0100 Subject: [PATCH 087/168] DEV: Fix another form of sending data in ember-cli (#15079) --- .../discourse/lib/bootstrap-json/index.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js index 1938ddc0f1..23e401e413 100644 --- a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js +++ b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js @@ -317,16 +317,15 @@ to serve API requests. For example: return true; } - if ( - request.get("Content-Type") && - request.get("Content-Type").includes("application/x-www-form-urlencoded") - ) { - return true; + const contentType = request.get("Content-Type"); + if (!contentType) { + return false; } if ( - request.get("Content-Type") && - request.get("Content-Type").includes("multipart/form-data") + contentType.includes("application/x-www-form-urlencoded") || + contentType.includes("multipart/form-data") || + contentType.includes("application/json") ) { return true; } From e41f98bf96b4c40428e6a308277c55907a9772ba Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 24 Nov 2021 20:13:52 +0100 Subject: [PATCH 088/168] DEV: Fix set-after-destroy issues (#15078) Fixes broken tests on the legacy ember env. --- .../admin/addon/components/dashboard-new-features.js | 4 ++++ .../discourse/app/controllers/create-account.js | 8 ++++++++ .../discourse/app/mixins/username-validation.js | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/app/assets/javascripts/admin/addon/components/dashboard-new-features.js b/app/assets/javascripts/admin/addon/components/dashboard-new-features.js index 059e138240..6e8defb93c 100644 --- a/app/assets/javascripts/admin/addon/components/dashboard-new-features.js +++ b/app/assets/javascripts/admin/addon/components/dashboard-new-features.js @@ -12,6 +12,10 @@ export default Component.extend({ this._super(...arguments); ajax("/admin/dashboard/new-features.json").then((json) => { + if (!this.element || this.isDestroying || this.isDestroyed) { + return; + } + this.setProperties({ newFeatures: json.new_features, hasUnseenFeatures: json.has_unseen_features, diff --git a/app/assets/javascripts/discourse/app/controllers/create-account.js b/app/assets/javascripts/discourse/app/controllers/create-account.js index 946ffd0288..370f0c210f 100644 --- a/app/assets/javascripts/discourse/app/controllers/create-account.js +++ b/app/assets/javascripts/discourse/app/controllers/create-account.js @@ -211,6 +211,10 @@ export default Controller.extend( return User.checkEmail(this.accountEmail) .then((result) => { + if (this.isDestroying || this.isDestroyed) { + return; + } + if (result.failed) { this.setProperties({ serverAccountEmail: this.accountEmail, @@ -356,6 +360,10 @@ export default Controller.extend( this.set("formSubmitted", true); return User.createAccount(attrs).then( (result) => { + if (this.isDestroying || this.isDestroyed) { + return; + } + this.set("isDeveloper", false); if (result.success) { // invalidate honeypot diff --git a/app/assets/javascripts/discourse/app/mixins/username-validation.js b/app/assets/javascripts/discourse/app/mixins/username-validation.js index 522b40ad5f..2e11cb75eb 100644 --- a/app/assets/javascripts/discourse/app/mixins/username-validation.js +++ b/app/assets/javascripts/discourse/app/mixins/username-validation.js @@ -86,6 +86,10 @@ export default Mixin.create({ checkUsernameAvailability() { return User.checkUsername(this.accountUsername, this.accountEmail).then( (result) => { + if (this.isDestroying || this.isDestroyed) { + return; + } + this.set("isDeveloper", false); if (result.available) { if (result.is_developer) { From de3680eb5c54c0ca8944af99f9286de7e4625221 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 24 Nov 2021 21:16:33 +0100 Subject: [PATCH 089/168] DEV: Re-allow node 17, with a warning (#15083) --- app/assets/javascripts/admin/package.json | 2 +- app/assets/javascripts/discourse-common/package.json | 2 +- app/assets/javascripts/discourse-hbr/package.json | 2 +- .../javascripts/discourse-widget-hbs/package.json | 2 +- .../discourse/lib/bootstrap-json/package.json | 2 +- app/assets/javascripts/discourse/package.json | 2 +- app/assets/javascripts/pretty-text/package.json | 2 +- app/assets/javascripts/select-kit/package.json | 2 +- app/assets/javascripts/truth-helpers/package.json | 2 +- bin/ember-cli | 10 ++++++++++ package.json | 2 +- 11 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json index 2d26ca55ef..8608b42a45 100644 --- a/app/assets/javascripts/admin/package.json +++ b/app/assets/javascripts/admin/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": "12.* || 14.* || 16.*", + "node": "12.* || 14.* || >= 16", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json index f804413fd2..ce6bb534ee 100644 --- a/app/assets/javascripts/discourse-common/package.json +++ b/app/assets/javascripts/discourse-common/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": "12.* || 14.* || 16.*", + "node": "12.* || 14.* || >= 16", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-hbr/package.json b/app/assets/javascripts/discourse-hbr/package.json index 41517f42de..0b290a071f 100644 --- a/app/assets/javascripts/discourse-hbr/package.json +++ b/app/assets/javascripts/discourse-hbr/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": "12.* || 14.* || 16.*", + "node": "12.* || 14.* || >= 16", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse-widget-hbs/package.json b/app/assets/javascripts/discourse-widget-hbs/package.json index fae0916093..06a8626fd8 100644 --- a/app/assets/javascripts/discourse-widget-hbs/package.json +++ b/app/assets/javascripts/discourse-widget-hbs/package.json @@ -46,7 +46,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": "12.* || 14.* || 16.*", + "node": "12.* || 14.* || >= 16", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/package.json b/app/assets/javascripts/discourse/lib/bootstrap-json/package.json index 5c86ee721a..abc04bd351 100644 --- a/app/assets/javascripts/discourse/lib/bootstrap-json/package.json +++ b/app/assets/javascripts/discourse/lib/bootstrap-json/package.json @@ -11,7 +11,7 @@ ] }, "engines": { - "node": "12.* || 14.* || 16.*", + "node": "12.* || 14.* || >= 16", "npm": "please-use-yarn", "yarn": ">= 1.21.1" } diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index 550b1594f5..a294e75117 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -66,7 +66,7 @@ "virtual-dom": "^2.1.1" }, "engines": { - "node": "12.* || 14.* || 16.*", + "node": "12.* || 14.* || >= 16", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json index 1ec1e8c21b..9619aa7198 100644 --- a/app/assets/javascripts/pretty-text/package.json +++ b/app/assets/javascripts/pretty-text/package.json @@ -45,7 +45,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": "12.* || 14.* || 16.*", + "node": "12.* || 14.* || >= 16", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json index 3dd5bf0f1e..eb95c12d0b 100644 --- a/app/assets/javascripts/select-kit/package.json +++ b/app/assets/javascripts/select-kit/package.json @@ -44,7 +44,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": "12.* || 14.* || 16.*", + "node": "12.* || 14.* || >= 16", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/app/assets/javascripts/truth-helpers/package.json b/app/assets/javascripts/truth-helpers/package.json index 36d50100c2..132705b564 100644 --- a/app/assets/javascripts/truth-helpers/package.json +++ b/app/assets/javascripts/truth-helpers/package.json @@ -44,7 +44,7 @@ "loader.js": "^4.7.0" }, "engines": { - "node": "12.* || 14.* || 16.*", + "node": "12.* || 14.* || >= 16", "npm": "please-use-yarn", "yarn": ">= 1.21.1" }, diff --git a/bin/ember-cli b/bin/ember-cli index 713876680f..931b4a2fb0 100755 --- a/bin/ember-cli +++ b/bin/ember-cli @@ -26,6 +26,10 @@ class String def cyan "\e[36m#{self}\e[0m" end + + def red + "\033[31m#{self}\e[0m" + end end if ARGV.include?("-h") || ARGV.include?("--help") @@ -48,6 +52,12 @@ end exit 1 if !system "yarn -s install --cwd #{yarn_dir}" +if !system("node -p 'require(\"crypto\").createHash(\"md4\")'", out: "/dev/null", err: "/dev/null") + $stderr << "#{"ERROR".red}: Node 17 with OpenSSL 3 is currently unsupported\n" + $stderr << "Please use node LTS (16.x) instead\n" + exit 1 +end + if ARGV.include?("-u") || ARGV.include?("--unicorn") unicorn_env = { "DISCOURSE_PORT" => ENV["DISCOURSE_PORT"] || "4200" } unicorn_pid = spawn(unicorn_env, __dir__ + "/unicorn") diff --git a/package.json b/package.json index ac6869dd30..7881bcf8f9 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "postinstall": "yarn --cwd app/assets/javascripts/discourse" }, "engines": { - "node": "12.* || 14.* || 16.*", + "node": "12.* || 14.* || >= 16", "npm": "please-use-yarn", "yarn": ">= 1.21.1" } From c27e324bd1cafa627e196c36ce669bd29c15f543 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 24 Nov 2021 14:51:23 -0500 Subject: [PATCH 090/168] FEATURE: Support i18n in Ember CLI plugin tests --- .../discourse/lib/translation-plugin.js | 21 +++++++++++++------ app/assets/javascripts/discourse/package.json | 3 ++- app/assets/javascripts/yarn.lock | 5 +++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/translation-plugin.js b/app/assets/javascripts/discourse/lib/translation-plugin.js index ca907b69dd..0fb923c52e 100644 --- a/app/assets/javascripts/discourse/lib/translation-plugin.js +++ b/app/assets/javascripts/discourse/lib/translation-plugin.js @@ -4,6 +4,8 @@ const fs = require("fs"); const concat = require("broccoli-concat"); const mergeTrees = require("broccoli-merge-trees"); const MessageFormat = require("messageformat"); +const deepmerge = require("deepmerge"); +const glob = require("glob"); let built = false; @@ -40,10 +42,14 @@ class TranslationPlugin extends Plugin { return; } - let file = this.inputPaths[0] + "/" + this.inputFile; + let parsed = {}; - let yaml = fs.readFileSync(file, { encoding: "UTF-8" }); - let parsed = Yaml.load(yaml); + this.inputPaths.forEach((path) => { + let file = path + "/" + this.inputFile; + let yaml = fs.readFileSync(file, { encoding: "UTF-8" }); + let loaded = Yaml.load(yaml); + parsed = deepmerge(parsed, loaded); + }); let extras = { en: { @@ -82,11 +88,14 @@ module.exports = function translatePlugin(...params) { }; module.exports.createI18nTree = function (discourseRoot, vendorJs) { - let en = new TranslationPlugin( - [discourseRoot + "/config/locales"], - "client.en.yml" + let translations = [discourseRoot + "/config/locales"].concat( + glob + .sync(discourseRoot + "/plugins/*/config/locales/client.en.yml") + .map((f) => f.replace(/\/client\.en\.yml$/, "")) ); + let en = new TranslationPlugin(translations, "client.en.yml"); + return concat( mergeTrees([ vendorJs, diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index a294e75117..c3886f25b2 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -22,15 +22,16 @@ "@ember/test-helpers": "^2.2.0", "@glimmer/component": "^1.0.0", "@popperjs/core": "2.10.2", - "@uppy/utils": "^4.0.3", "@uppy/aws-s3": "^2.0.4", "@uppy/aws-s3-multipart": "^2.1.0", "@uppy/core": "^2.1.0", "@uppy/drop-target": "^1.1.0", + "@uppy/utils": "^4.0.3", "@uppy/xhr-upload": "^2.0.4", "admin": "^1.0.0", "bent": "^7.3.12", "broccoli-asset-rev": "^3.0.0", + "deepmerge": "^4.2.2", "discourse-common": "^1.0.0", "discourse-hbr": "^1.0.0", "discourse-widget-hbs": "^1.0.0", diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock index 2d0667d176..9c5b9bd418 100644 --- a/app/assets/javascripts/yarn.lock +++ b/app/assets/javascripts/yarn.lock @@ -4526,6 +4526,11 @@ deep-is@^0.1.3, deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + defaults@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" From 7ce927eaa84bfaa9e72bd2f371625f2f95f6c42e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 22:30:43 +0100 Subject: [PATCH 091/168] Build(deps): Bump bootsnap from 1.9.1 to 1.9.3 (#15084) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.9.1 to 1.9.3. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.9.1...v1.9.3) --- updated-dependencies: - dependency-name: bootsnap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4a48036e70..3f0b646e0b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM rack (>= 0.9.0) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.9.1) + bootsnap (1.9.3) msgpack (~> 1.0) builder (3.2.4) bullet (6.1.5) From 704974da6ab41cf156f89c9051e49a8f3a44c9c2 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 25 Nov 2021 00:45:55 +0100 Subject: [PATCH 092/168] DEV: Allow using incorrect headers with ember-cli (#15085) Makes it possible to pass-through invalid headers, e.g. `Content-Type: multipart/form-data;;` That ability regressed with the latest changes. --- app/assets/javascripts/discourse/lib/bootstrap-json/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js index 23e401e413..4295eebc9d 100644 --- a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js +++ b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js @@ -286,7 +286,7 @@ to serve API requests. For example: baseURL = rootURL === "" ? "/" : cleanBaseURL(rootURL || baseURL); - const rawMiddleware = express.raw({ type: "*/*", limit: "100mb" }); + const rawMiddleware = express.raw({ type: () => true, limit: "100mb" }); app.use(rawMiddleware, async (req, res, next) => { try { From db5edc713b950ed8282526d76b79079892886616 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Thu, 25 Nov 2021 09:26:28 +0800 Subject: [PATCH 093/168] DEV: Make it clear that plugin-api on the client side follows semver. (#15070) --- app/assets/javascripts/discourse/app/lib/plugin-api.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js index e869e47daa..5d7d924a72 100644 --- a/app/assets/javascripts/discourse/app/lib/plugin-api.js +++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js @@ -93,7 +93,8 @@ import { import { CUSTOM_USER_SEARCH_OPTIONS } from "select-kit/components/user-chooser"; import { downloadCalendar } from "discourse/lib/download-calendar"; -// If you add any methods to the API ensure you bump up this number +// If you add any methods to the API ensure you bump up the version number +// based on Semantic Versioning 2.0.0. const PLUGIN_API_VERSION = "0.14.0"; // This helper prevents us from applying the same `modifyClass` over and over in test mode. From 09260148b16f44a9163a8fea25d8c742e65aa89d Mon Sep 17 00:00:00 2001 From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com> Date: Wed, 24 Nov 2021 22:10:26 -0600 Subject: [PATCH 094/168] DEV: Add cta app event (#15051) Add app event for when CTA is triggered for anon users --- app/assets/javascripts/discourse/app/initializers/signup-cta.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/discourse/app/initializers/signup-cta.js b/app/assets/javascripts/discourse/app/initializers/signup-cta.js index 48df8e19d0..c44a1b00fa 100644 --- a/app/assets/javascripts/discourse/app/initializers/signup-cta.js +++ b/app/assets/javascripts/discourse/app/initializers/signup-cta.js @@ -14,6 +14,7 @@ export default { const siteSettings = container.lookup("site-settings:main"); const keyValueStore = container.lookup("key-value-store:main"); const user = container.lookup("current-user:main"); + const appEvents = container.lookup("service:app-events"); screenTrack.keyValueStore = keyValueStore; @@ -72,6 +73,7 @@ export default { // Requirements met. session.set("showSignupCta", true); + appEvents.trigger("cta:shown"); } screenTrack.registerAnonCallback(checkSignupCtaRequirements); From 4c46c7e334accd3679ab5634675017aa89429154 Mon Sep 17 00:00:00 2001 From: Natalie Tay Date: Thu, 25 Nov 2021 12:22:43 +0800 Subject: [PATCH 095/168] DEV: Remove xlink hrefs (#15059) --- .../discourse-common/addon/lib/icon-library.js | 7 ++----- .../javascripts/discourse/app/lib/plugin-api.js | 4 ++-- .../app/templates/components/login-buttons.hbs | 2 +- .../discourse/tests/acceptance/bookmarks-test.js | 4 ++-- .../tests/integration/components/d-icon-test.js | 4 ++-- .../tests/unit/lib/icon-library-test.js | 2 +- .../discourse/tests/unit/lib/to-markdown-test.js | 2 +- .../stylesheets/common/components/svg.scss | 4 ++-- app/views/static/show.html.erb | 2 +- lib/cooked_post_processor.rb | 2 +- lib/cooked_processor_mixin.rb | 4 ++-- .../templates/discourse_user_onebox.mustache | 4 ++-- lib/upload_creator.rb | 3 --- .../initializers/discourse-local-dates.js | 2 +- .../javascripts/lib/local-date-builder-test.js | 16 ++++++++-------- .../templates/new_user.svg.erb | 6 +++--- spec/components/cooked_post_processor_spec.rb | 16 ++++++++-------- spec/helpers/user_notifications_helper_spec.rb | 2 +- spec/lib/upload_creator_spec.rb | 4 ++-- spec/services/search_indexer_spec.rb | 4 ++-- 20 files changed, 44 insertions(+), 50 deletions(-) diff --git a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js index e6c740b353..edf8160c3e 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js +++ b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js @@ -149,7 +149,7 @@ registerIconRenderer({ if (params.label) { html += " aria-hidden='true'"; } - html += ` xmlns="${SVG_NAMESPACE}">`; + html += ` xmlns="${SVG_NAMESPACE}">`; if (params.label) { html += `${escape(params.label)}`; } @@ -178,10 +178,7 @@ registerIconRenderer({ }, [ h("use", { - "xlink:href": attributeHook( - "http://www.w3.org/1999/xlink", - `#${escape(id)}` - ), + href: attributeHook("http://www.w3.org/1999/xlink", `#${escape(id)}`), namespace: SVG_NAMESPACE, }), ] diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js index 5d7d924a72..b897b219f4 100644 --- a/app/assets/javascripts/discourse/app/lib/plugin-api.js +++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js @@ -234,7 +234,7 @@ class PluginApi { * * // for the place in code that render a string * string() { - * return ""; + * return ""; * }, * * // for the places in code that render virtual dom elements @@ -244,7 +244,7 @@ class PluginApi { * namespace: "http://www.w3.org/2000/svg" * },[ * h("use", { - * "xlink:href": attributeHook("http://www.w3.org/1999/xlink", `#far-smile`), + * "href": attributeHook("http://www.w3.org/1999/xlink", `#far-smile`), * namespace: "http://www.w3.org/2000/svg" * })] * ); diff --git a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs index cba646b2be..f334a04109 100644 --- a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs @@ -1,7 +1,7 @@ {{#each buttons as |b|}}
From fa8cd629f1ad4c64308e3e5c1d93f3ae78b2815a Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Thu, 25 Nov 2021 09:34:39 +0200 Subject: [PATCH 096/168] DEV: Hash tokens stored from email_tokens (#14493) This commit adds token_hash and scopes columns to email_tokens table. token_hash is a replacement for the token column to avoid storing email tokens in plaintext as it can pose a security risk. The new scope column ensures that email tokens cannot be used to perform a different action than the one intended. To sum up, this commit: * Adds token_hash and scope to email_tokens * Reuses code that schedules critical_user_email * Refactors EmailToken.confirm and EmailToken.atomic_confirm methods * Periodically cleans old, unconfirmed or expired email tokens --- app/controllers/admin/users_controller.rb | 2 +- .../finish_installation_controller.rb | 11 +- app/controllers/invites_controller.rb | 15 +- app/controllers/session_controller.rb | 8 +- .../users/omniauth_callbacks_controller.rb | 5 +- app/controllers/users_controller.rb | 46 ++--- app/controllers/users_email_controller.rb | 10 +- .../scheduled/activation_reminder_emails.rb | 12 +- app/jobs/scheduled/clean_up_email_tokens.rb | 14 ++ app/mailers/invite_mailer.rb | 2 +- app/models/email_change_request.rb | 15 +- app/models/email_token.rb | 165 ++++++++------- app/models/invite_redeemer.rb | 2 +- app/models/user.rb | 10 +- app/services/user_activator.rb | 11 +- app/services/user_authenticator.rb | 5 +- .../show_confirm_new_email.html.erb | 10 +- .../show_confirm_old_email.html.erb | 2 +- ...929215543_add_token_hash_to_email_token.rb | 29 +++ ...20211005163152_add_scope_to_email_token.rb | 11 + lib/email_updater.rb | 87 ++++---- lib/tasks/admin.rake | 2 +- spec/components/email_updater_spec.rb | 122 +++++------ spec/fabricators/email_token_fabricator.rb | 1 + spec/jobs/automatic_group_membership_spec.rb | 4 +- spec/mailers/user_notifications_spec.rb | 2 +- spec/models/email_token_spec.rb | 22 +- spec/models/user_spec.rb | 12 +- spec/models/web_hook_spec.rb | 2 +- spec/requests/api/users_spec.rb | 12 +- spec/requests/session_controller_spec.rb | 26 ++- spec/requests/users_controller_spec.rb | 191 ++++++------------ spec/requests/users_email_controller_spec.rb | 174 ++++++---------- spec/services/user_activator_spec.rb | 39 +--- 34 files changed, 482 insertions(+), 599 deletions(-) create mode 100644 app/jobs/scheduled/clean_up_email_tokens.rb create mode 100644 db/migrate/20210929215543_add_token_hash_to_email_token.rb create mode 100644 db/migrate/20211005163152_add_scope_to_email_token.rb diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 637172fa8a..1c411fae98 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -328,7 +328,7 @@ class Admin::UsersController < Admin::AdminController def activate guardian.ensure_can_activate!(@user) # ensure there is an active email token - @user.email_tokens.create(email: @user.email) unless @user.email_tokens.active.exists? + @user.email_tokens.create!(email: @user.email, scope: EmailToken.scopes[:signup]) if !@user.email_tokens.active.exists? @user.activate StaffActionLogger.new(current_user).log_user_activate(@user, I18n.t('user.activated_by_staff')) render json: success_json diff --git a/app/controllers/finish_installation_controller.rb b/app/controllers/finish_installation_controller.rb index 13b7b64f5d..e84252c65a 100644 --- a/app/controllers/finish_installation_controller.rb +++ b/app/controllers/finish_installation_controller.rb @@ -33,7 +33,6 @@ class FinishInstallationController < ApplicationController send_signup_email redirect_confirm(@user.email) end - end end @@ -50,14 +49,10 @@ class FinishInstallationController < ApplicationController protected def send_signup_email - email_token = @user.email_tokens.unconfirmed.active.first + return if @user.active && @user.email_confirmed? - if email_token.present? - Jobs.enqueue(:critical_user_email, - type: :signup, - user_id: @user.id, - email_token: email_token.token) - end + email_token = @user.email_tokens.create!(email: @user.email, scope: EmailToken.scopes[:signup]) + EmailToken.enqueue_signup_email(email_token) end def redirect_confirm(email) diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index 85c17e4b4d..3cc4ecc455 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -415,7 +415,10 @@ class InvitesController < ApplicationController Group.refresh_automatic_groups!(:admins, :moderators, :staff) if user.staff? if user.has_password? - send_activation_email(user) unless user.active + if !user.active + email_token = user.email_tokens.create!(email: user.email, scope: EmailToken.scopes[:signup]) + EmailToken.enqueue_signup_email(email_token) + end elsif !SiteSetting.enable_discourse_connect && SiteSetting.enable_local_logins Jobs.enqueue(:invite_password_instructions_email, username: user.username) end @@ -440,14 +443,4 @@ class InvitesController < ApplicationController end end end - - def send_activation_email(user) - email_token = user.email_tokens.create!(email: user.email) - - Jobs.enqueue(:critical_user_email, - type: :signup, - user_id: user.id, - email_token: email_token.token - ) - end end diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb index 1f099228bb..76ca11fd39 100644 --- a/app/controllers/session_controller.rb +++ b/app/controllers/session_controller.rb @@ -339,7 +339,7 @@ class SessionController < ApplicationController def email_login_info token = params[:token] - matched_token = EmailToken.confirmable(token) + matched_token = EmailToken.confirmable(token, scope: EmailToken.scopes[:email_login]) user = matched_token&.user check_local_login_allowed(user: user, check_login_via_email: true) @@ -377,7 +377,7 @@ class SessionController < ApplicationController def email_login token = params[:token] - matched_token = EmailToken.confirmable(token) + matched_token = EmailToken.confirmable(token, scope: EmailToken.scopes[:email_login]) user = matched_token&.user check_local_login_allowed(user: user, check_login_via_email: true) @@ -388,7 +388,7 @@ class SessionController < ApplicationController return render(json: @second_factor_failure_payload) end - if user = EmailToken.confirm(token) + if user = EmailToken.confirm(token, scope: EmailToken.scopes[:email_login]) if login_not_approved_for?(user) return render json: login_not_approved elsif payload = login_error_check(user) @@ -444,7 +444,7 @@ class SessionController < ApplicationController user_presence = user.present? && user.human? && !user.staged if user_presence - email_token = user.email_tokens.create(email: user.email) + email_token = user.email_tokens.create!(email: user.email, scope: EmailToken.scopes[:password_reset]) Jobs.enqueue(:critical_user_email, type: :forgot_password, user_id: user.id, email_token: email_token.token) end diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 7850cf2c67..57c794f9cc 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -155,9 +155,8 @@ class Users::OmniauthCallbacksController < ApplicationController user.update!(password: SecureRandom.hex) # Ensure there is an active email token - unless EmailToken.where(email: user.email, confirmed: true).exists? || - user.email_tokens.active.where(email: user.email).exists? - user.email_tokens.create!(email: user.email) + if !EmailToken.where(email: user.email, confirmed: true).exists? && !user.email_tokens.active.where(email: user.email).exists? + user.email_tokens.create!(email: user.email, scope: EmailToken.scopes[:signup]) end user.activate diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b4919f5c9d..3e2a815949 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -783,7 +783,6 @@ class UsersController < ApplicationController # no point doing anything else if we can't even find # a user from the token if @user - if !secure_session["second-factor-#{token}"] second_factor_authentication_result = @user.authenticate_second_factor(params, secure_session) if !second_factor_authentication_result.ok @@ -869,7 +868,7 @@ class UsersController < ApplicationController def confirm_email_token expires_now - EmailToken.confirm(params[:token]) + EmailToken.confirm(params[:token], scope: EmailToken.scopes[:signup]) render json: success_json end @@ -895,7 +894,7 @@ class UsersController < ApplicationController RateLimiter.new(nil, "admin-login-min-#{request.remote_ip}", 3, 1.minute).performed! if user = User.with_email(params[:email]).admins.human_users.first - email_token = user.email_tokens.create(email: user.email) + email_token = user.email_tokens.create!(email: user.email, scope: EmailToken.scopes[:email_login]) Jobs.enqueue(:critical_user_email, type: :admin_login, user_id: user.id, email_token: email_token.token) @message = I18n.t("admin_login.success") else @@ -926,7 +925,7 @@ class UsersController < ApplicationController RateLimiter.new(nil, "email-login-min-#{user.id}", 3, 1.minute).performed! if user_presence - email_token = user.email_tokens.create!(email: user.email) + email_token = user.email_tokens.create!(email: user.email, scope: EmailToken.scopes[:email_login]) Jobs.enqueue(:critical_user_email, type: :email_login, @@ -996,7 +995,7 @@ class UsersController < ApplicationController def perform_account_activation raise Discourse::InvalidAccess.new if honeypot_or_challenge_fails?(params) - if @user = EmailToken.confirm(params[:token]) + if @user = EmailToken.confirm(params[:token], scope: EmailToken.scopes[:signup]) # Log in the user unless they need to be approved if Guardian.new(@user).can_access_forum? @user.enqueue_welcome_message('welcome_user') if @user.send_welcome_message @@ -1041,8 +1040,8 @@ class UsersController < ApplicationController primary_email.skip_validate_email = false if primary_email.save - @user.email_tokens.create!(email: @user.email) - enqueue_activation_email + @email_token = @user.email_tokens.create!(email: @user.email, scope: EmailToken.scopes[:signup]) + EmailToken.enqueue_signup_email(@email_token, to_address: @user.email) render json: success_json else render_json_error(primary_email) @@ -1061,11 +1060,10 @@ class UsersController < ApplicationController if params[:username].present? @user = User.find_by_username_or_email(params[:username].to_s) end + raise Discourse::NotFound unless @user - if !current_user&.staff? && - @user.id != session[SessionController::ACTIVATE_USER_KEY] - + if !current_user&.staff? && @user.id != session[SessionController::ACTIVATE_USER_KEY] raise Discourse::InvalidAccess.new end @@ -1074,17 +1072,12 @@ class UsersController < ApplicationController if @user.active && @user.email_confirmed? render_json_error(I18n.t('activation.activated'), status: 409) else - @email_token = @user.email_tokens.unconfirmed.active.first - enqueue_activation_email + @email_token = @user.email_tokens.create!(email: @user.email, scope: EmailToken.scopes[:signup]) + EmailToken.enqueue_signup_email(@email_token, to_address: @user.email) render body: nil end end - def enqueue_activation_email - @email_token ||= @user.email_tokens.create!(email: @user.email) - Jobs.enqueue(:critical_user_email, type: :signup, user_id: @user.id, email_token: @email_token.token, to_address: @user.email) - end - def search_users term = params[:term].to_s.strip @@ -1635,14 +1628,17 @@ class UsersController < ApplicationController end def password_reset_find_user(token, committing_change:) - if EmailToken.valid_token_format?(token) - @user = committing_change ? EmailToken.confirm(token) : EmailToken.confirmable(token)&.user - if @user - secure_session["password-#{token}"] = @user.id - else - user_id = secure_session["password-#{token}"].to_i - @user = User.find(user_id) if user_id > 0 - end + @user = if committing_change + EmailToken.confirm(token, scope: EmailToken.scopes[:password_reset]) + else + EmailToken.confirmable(token, scope: EmailToken.scopes[:password_reset])&.user + end + + if @user + secure_session["password-#{token}"] = @user.id + else + user_id = secure_session["password-#{token}"].to_i + @user = User.find(user_id) if user_id > 0 end @error = I18n.t('password_reset.no_token') if !@user diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb index a4af506c1d..f3f30a47dd 100644 --- a/app/controllers/users_email_controller.rb +++ b/app/controllers/users_email_controller.rb @@ -200,17 +200,17 @@ class UsersEmailController < ApplicationController def load_change_request(type) expires_now - @token = EmailToken.confirmable(params[:token]) + token = EmailToken.confirmable(params[:token], scope: EmailToken.scopes[:email_update]) - if @token + if token if type == :old - @change_request = @token.user&.email_change_requests.where(old_email_token_id: @token.id).first + @change_request = token.user&.email_change_requests.where(old_email_token_id: token.id).first elsif type == :new - @change_request = @token.user&.email_change_requests.where(new_email_token_id: @token.id).first + @change_request = token.user&.email_change_requests.where(new_email_token_id: token.id).first end end - @user = @token&.user + @user = token&.user if (!@user || !@change_request) @error = I18n.t("change_email.already_done") diff --git a/app/jobs/scheduled/activation_reminder_emails.rb b/app/jobs/scheduled/activation_reminder_emails.rb index 171b5d139c..c3203a273d 100644 --- a/app/jobs/scheduled/activation_reminder_emails.rb +++ b/app/jobs/scheduled/activation_reminder_emails.rb @@ -13,11 +13,13 @@ module Jobs user.custom_fields['activation_reminder'] = true user.save_custom_fields - email_token = user.email_tokens.create!(email: user.email) - ::Jobs.enqueue(:user_email, - type: :activation_reminder, - user_id: user.id, - email_token: email_token.token) + email_token = user.email_tokens.create!(email: user.email, scope: EmailToken.scopes[:signup]) + ::Jobs.enqueue( + :user_email, + type: :activation_reminder, + user_id: user.id, + email_token: email_token.token + ) end end end diff --git a/app/jobs/scheduled/clean_up_email_tokens.rb b/app/jobs/scheduled/clean_up_email_tokens.rb new file mode 100644 index 0000000000..006c5dbf02 --- /dev/null +++ b/app/jobs/scheduled/clean_up_email_tokens.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +module Jobs + class CleanUpEmailTokens < ::Jobs::Scheduled + every 1.day + + def execute(args) + EmailToken + .where('NOT confirmed OR expired') + .where('created_at < ?', 1.month.ago) + .delete_all + end + end +end diff --git a/app/mailers/invite_mailer.rb b/app/mailers/invite_mailer.rb index 6f5f284422..6f7fee6346 100644 --- a/app/mailers/invite_mailer.rb +++ b/app/mailers/invite_mailer.rb @@ -56,7 +56,7 @@ class InviteMailer < ActionMailer::Base def send_password_instructions(user) if user.present? - email_token = user.email_tokens.create(email: user.email) + email_token = user.email_tokens.create!(email: user.email, scope: EmailToken.scopes[:password_reset]) build_email(user.email, template: 'invite_password_instructions', email_token: email_token.token) diff --git a/app/models/email_change_request.rb b/app/models/email_change_request.rb index 74bb307bea..5282d5d2fd 100644 --- a/app/models/email_change_request.rb +++ b/app/models/email_change_request.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true class EmailChangeRequest < ActiveRecord::Base + belongs_to :user belongs_to :old_email_token, class_name: 'EmailToken', dependent: :destroy belongs_to :new_email_token, class_name: 'EmailToken', dependent: :destroy - belongs_to :user belongs_to :requested_by, class_name: "User", foreign_key: :requested_by_user_id validates :new_email, presence: true, format: { with: EmailValidator.email_regex } @@ -12,6 +12,13 @@ class EmailChangeRequest < ActiveRecord::Base @states ||= Enum.new(authorizing_old: 1, authorizing_new: 2, complete: 3) end + def self.find_by_new_token(token) + EmailChangeRequest + .joins("INNER JOIN email_tokens ON email_tokens.id = email_change_requests.new_email_token_id") + .where("email_tokens.token_hash = ?", EmailToken.hash_token(token)) + .last + end + def requested_by_admin? self.requested_by&.admin? && !self.requested_by_self? end @@ -19,12 +26,6 @@ class EmailChangeRequest < ActiveRecord::Base def requested_by_self? self.requested_by_user_id == self.user_id end - - def self.find_by_new_token(token) - joins( - "INNER JOIN email_tokens ON email_tokens.id = email_change_requests.new_email_token_id" - ).where("email_tokens.token = ?", token).last - end end # == Schema Information diff --git a/app/models/email_token.rb b/app/models/email_token.rb index 8472881b8b..020a011284 100644 --- a/app/models/email_token.rb +++ b/app/models/email_token.rb @@ -1,97 +1,106 @@ # frozen_string_literal: true class EmailToken < ActiveRecord::Base + class TokenAccessError < StandardError; end + belongs_to :user - validates :token, :user_id, :email, presence: true + validates :user_id, :email, :token_hash, presence: true - before_validation(on: :create) do - self.token = EmailToken.generate_token - self.email = self.email.downcase if self.email - end + scope :unconfirmed, -> { where(confirmed: false) } + scope :active, -> { where(expired: false).where('created_at >= ?', SiteSetting.email_token_valid_hours.hours.ago) } - after_create do - # Expire the previous tokens - EmailToken.where(user_id: self.user_id) - .where("id != ?", self.id) - .update_all(expired: true) - end - - def self.token_length - 16 - end - - def self.valid_after - SiteSetting.email_token_valid_hours.hours.ago - end - - def self.unconfirmed - where(confirmed: false) - end - - def self.active - where(expired: false).where('created_at > ?', valid_after) - end - - def self.generate_token - SecureRandom.hex(EmailToken.token_length) - end - - def self.valid_token_format?(token) - token.present? && token =~ /\h{#{token.length / 2}}/i - end - - def self.atomic_confirm(token) - failure = { success: false } - return failure unless valid_token_format?(token) - - email_token = confirmable(token) - return failure if email_token.blank? - - user = email_token.user - failure[:user] = user - row_count = EmailToken.where(confirmed: false, id: email_token.id, expired: false).update_all 'confirmed = true' - - if row_count == 1 - { success: true, user: user, email_token: email_token } - else - failure + after_initialize do + if self.token_hash.blank? + @token ||= SecureRandom.hex + self.token = @token + self.token_hash = self.class.hash_token(@token) end end - def self.confirm(token, skip_reviewable: false) - User.transaction do - result = atomic_confirm(token) - user = result[:user] - if result[:success] - # If we are activating the user, send the welcome message - user.send_welcome_message = !user.active? - user.email = result[:email_token].email - user.active = true - user.custom_fields.delete('activation_reminder') - user.save! - user.create_reviewable unless skip_reviewable - user.set_automatic_groups - DiscourseEvent.trigger(:user_confirmed_email, user) - end + after_create do + EmailToken + .where(user_id: self.user_id) + .where(scope: [nil, self.scope]) + .where.not(id: self.id) + .update_all(expired: true) + end - if user - if Invite.redeem_from_email(user.email).present? - user.reload - end - user - end + before_validation do + self.email = self.email.downcase if self.email + end + + before_save do + if self.scope.blank? + Discourse.deprecate("EmailToken#scope cannot be empty.", output_in_test: true) + end + end + + def self.scopes + @scopes ||= Enum.new( + signup: 1, + password_reset: 2, + email_login: 3, + email_update: 4, + ) + end + + def token + raise TokenAccessError.new if @token.blank? + self[:token] + end + + def self.confirm(token, scope: nil, skip_reviewable: false) + User.transaction do + email_token = confirmable(token, scope: scope) + return if email_token.blank? + + email_token.update!(confirmed: true) + + user = email_token.user + user.send_welcome_message = !user.active? + user.email = email_token.email + user.active = true + user.custom_fields.delete('activation_reminder') + user.save! + user.create_reviewable if !skip_reviewable + user.set_automatic_groups + DiscourseEvent.trigger(:user_confirmed_email, user) + Invite.redeem_from_email(user.email) + + user.reload end rescue ActiveRecord::RecordInvalid # If the user's email is already taken, just return nil (failure) end - def self.confirmable(token) - EmailToken.where(token: token) - .where(expired: false, confirmed: false) - .where("created_at >= ?", EmailToken.valid_after) + def self.confirmable(token, scope: nil) + return nil if token.blank? + + relation = unconfirmed.active .includes(:user) - .first + .where(token_hash: hash_token(token)) + + # TODO(2022-01-01): All email tokens should have scopes by now + if !scope + relation.first + else + relation.where(scope: scope).first || relation.where(scope: nil).first + end + end + + def self.enqueue_signup_email(email_token, to_address: nil) + Jobs.enqueue( + :critical_user_email, + type: :signup, + user_id: email_token.user_id, + email_token: email_token.token, + to_address: to_address + ) + end + + def self.hash_token(token) + Digest::SHA256.hexdigest(token) end end @@ -107,6 +116,8 @@ end # expired :boolean default(FALSE), not null # created_at :datetime not null # updated_at :datetime not null +# token_hash :string not null +# scope :integer # # Indexes # diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb index 9dfc743cbd..2ba2a6771b 100644 --- a/app/models/invite_redeemer.rb +++ b/app/models/invite_redeemer.rb @@ -74,7 +74,7 @@ InviteRedeemer = Struct.new(:invite, :email, :username, :name, :password, :user_ authenticator.finish if invite.emailed_status != Invite.emailed_status_types[:not_required] && email == invite.email && invite.email_token.present? && email_token == invite.email_token - user.email_tokens.create!(email: user.email) + user.email_tokens.create!(email: user.email, scope: EmailToken.scopes[:signup]) user.activate end diff --git a/app/models/user.rb b/app/models/user.rb index 40c48bd150..5df57647b9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1049,11 +1049,9 @@ class User < ActiveRecord::Base end def activate - if email_token = self.email_tokens.active.where(email: self.email).first - EmailToken.confirm(email_token.token, skip_reviewable: true) - end - self.update!(active: true) - create_reviewable + email_token = self.email_tokens.create!(email: self.email, scope: EmailToken.scopes[:signup]) + EmailToken.confirm(email_token.token, scope: EmailToken.scopes[:signup]) + reload end def deactivate(performed_by) @@ -1495,7 +1493,7 @@ class User < ActiveRecord::Base end def create_email_token - email_tokens.create!(email: email) + email_tokens.create!(email: email, scope: EmailToken.scopes[:signup]) end def ensure_password_is_hashed diff --git a/app/services/user_activator.rb b/app/services/user_activator.rb index 6a7d8ad1b0..4c0d14ab62 100644 --- a/app/services/user_activator.rb +++ b/app/services/user_activator.rb @@ -54,15 +54,8 @@ end class EmailActivator < UserActivator def activate - email_token = user.email_tokens.unconfirmed.active.first - email_token = user.email_tokens.create(email: user.email) if email_token.nil? - - Jobs.enqueue(:critical_user_email, - type: :signup, - user_id: user.id, - email_token: email_token.token - ) - + email_token = user.email_tokens.create!(email: user.email, scope: EmailToken.scopes[:signup]) + EmailToken.enqueue_signup_email(email_token) success_message end diff --git a/app/services/user_authenticator.rb b/app/services/user_authenticator.rb index 48d0b8038a..c5cd920cf1 100644 --- a/app/services/user_authenticator.rb +++ b/app/services/user_authenticator.rb @@ -49,10 +49,7 @@ class UserAuthenticator private def confirm_email - if authenticated? - EmailToken.confirm(@user.email_tokens.first.token) - @user.set_automatic_groups - end + @user.activate if authenticated? end def authenticator diff --git a/app/views/users_email/show_confirm_new_email.html.erb b/app/views/users_email/show_confirm_new_email.html.erb index d5a49bc3cb..b820ba6039 100644 --- a/app/views/users_email/show_confirm_new_email.html.erb +++ b/app/views/users_email/show_confirm_new_email.html.erb @@ -24,7 +24,7 @@

<%=form_tag(u_confirm_new_email_path, method: :put) do %> - <%= hidden_field_tag 'token', @token.token %> + <%= hidden_field_tag 'token', params[:token] %> <%= hidden_field_tag 'second_factor_token', nil, id: 'security-key-credential' %>
@@ -34,7 +34,7 @@ <% if @show_backup_codes %>
- <%= hidden_field_tag 'second_factor_method', UserSecondFactor.methods[:backup_code] %> + <%= hidden_field_tag 'second_factor_method', UserSecondFactor.methods[:backup_code] %>

<%= t('login.second_factor_backup_title') %>

<%= label_tag(:second_factor_token, t("login.second_factor_backup_description")) %>
<%= render 'common/second_factor_backup_input' %>
@@ -44,8 +44,8 @@ <%= link_to t("login.second_factor_toggle.totp"), show_backup: "false" %>
<% elsif @show_security_key %> - <%= hidden_field_tag 'security_key_challenge', @security_key_challenge, id: 'security-key-challenge' %> - <%= hidden_field_tag 'second_factor_method', UserSecondFactor.methods[:security_key] %> + <%= hidden_field_tag 'security_key_challenge', @security_key_challenge, id: 'security-key-challenge' %> + <%= hidden_field_tag 'second_factor_method', UserSecondFactor.methods[:security_key] %> <%= hidden_field_tag 'security_key_allowed_credential_ids', @security_key_allowed_credential_ids.join(","), id: 'security-key-allowed-credential-ids' %>

<%= t('login.security_key_authenticate') %>

@@ -61,7 +61,7 @@ <% end %> <% elsif @show_second_factor %>
- <%= hidden_field_tag 'second_factor_method', UserSecondFactor.methods[:totp] %> + <%= hidden_field_tag 'second_factor_method', UserSecondFactor.methods[:totp] %>

<%= t('login.second_factor_title') %>

<%= label_tag(:second_factor_token, t('login.second_factor_description')) %>
<%= render 'common/second_factor_text_field' %>
diff --git a/app/views/users_email/show_confirm_old_email.html.erb b/app/views/users_email/show_confirm_old_email.html.erb index 9fc65856cb..403103e8b2 100644 --- a/app/views/users_email/show_confirm_old_email.html.erb +++ b/app/views/users_email/show_confirm_old_email.html.erb @@ -27,7 +27,7 @@

<%=form_tag(u_confirm_old_email_path, method: :put) do %> - <%= hidden_field_tag 'token', @token.token %> + <%= hidden_field_tag 'token', params[:token] %> <%= submit_tag t('change_email.confirm'), class: "btn btn-primary" %> <% end %> <% end %> diff --git a/db/migrate/20210929215543_add_token_hash_to_email_token.rb b/db/migrate/20210929215543_add_token_hash_to_email_token.rb new file mode 100644 index 0000000000..b691b3cedf --- /dev/null +++ b/db/migrate/20210929215543_add_token_hash_to_email_token.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +class AddTokenHashToEmailToken < ActiveRecord::Migration[6.1] + def up + add_column :email_tokens, :token_hash, :string + + loop do + rows = DB + .query("SELECT id, token FROM email_tokens WHERE token_hash IS NULL LIMIT 500") + .map { |row| { id: row.id, token_hash: Digest::SHA256.hexdigest(row.token) } } + + break if rows.size == 0 + + data_string = rows.map { |r| "(#{r[:id]}, '#{r[:token_hash]}')" }.join(",") + execute <<~SQL + UPDATE email_tokens + SET token_hash = data.token_hash + FROM (VALUES #{data_string}) AS data(id, token_hash) + WHERE email_tokens.id = data.id + SQL + end + + change_column_null :email_tokens, :token_hash, false + end + + def down + drop_column :email_tokens, :token_hash, :string + end +end diff --git a/db/migrate/20211005163152_add_scope_to_email_token.rb b/db/migrate/20211005163152_add_scope_to_email_token.rb new file mode 100644 index 0000000000..e6ef09cac9 --- /dev/null +++ b/db/migrate/20211005163152_add_scope_to_email_token.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class AddScopeToEmailToken < ActiveRecord::Migration[6.1] + def up + add_column :email_tokens, :scope, :integer + end + + def down + drop_column :email_tokens, :scope, :integer + end +end diff --git a/lib/email_updater.rb b/lib/email_updater.rb index 5c99219b54..f5e41fc812 100644 --- a/lib/email_updater.rb +++ b/lib/email_updater.rb @@ -4,6 +4,7 @@ class EmailUpdater include HasErrors attr_reader :user + attr_reader :change_req def self.human_attribute_name(name, options = {}) User.human_attribute_name(name, options) @@ -48,16 +49,16 @@ class EmailUpdater UserHistory.create!(action: UserHistory.actions[:add_email], acting_user_id: @user.id) end - change_req = EmailChangeRequest.find_or_initialize_by(user_id: @user.id, new_email: email) + @change_req = EmailChangeRequest.find_or_initialize_by(user_id: @user.id, new_email: email) - if change_req.new_record? - change_req.requested_by = @guardian.user - change_req.old_email = old_email - change_req.new_email = email + if @change_req.new_record? + @change_req.requested_by = @guardian.user + @change_req.old_email = old_email + @change_req.new_email = email end - if change_req.change_state.blank? || change_req.change_state == EmailChangeRequest.states[:complete] - change_req.change_state = if @user.staff? + if @change_req.change_state.blank? || @change_req.change_state == EmailChangeRequest.states[:complete] + @change_req.change_state = if @user.staff? # Staff users must confirm their old email address first. EmailChangeRequest.states[:authorizing_old] else @@ -65,51 +66,53 @@ class EmailUpdater end end - if change_req.change_state == EmailChangeRequest.states[:authorizing_old] - change_req.old_email_token = @user.email_tokens.create!(email: @user.email) - send_email(add ? :confirm_old_email_add : :confirm_old_email, change_req.old_email_token) - elsif change_req.change_state == EmailChangeRequest.states[:authorizing_new] - change_req.new_email_token = @user.email_tokens.create!(email: email) - send_email(:confirm_new_email, change_req.new_email_token) + if @change_req.change_state == EmailChangeRequest.states[:authorizing_old] + @change_req.old_email_token = @user.email_tokens.create!(email: @user.email, scope: EmailToken.scopes[:email_update]) + send_email(add ? :confirm_old_email_add : :confirm_old_email, @change_req.old_email_token) + elsif @change_req.change_state == EmailChangeRequest.states[:authorizing_new] + @change_req.new_email_token = @user.email_tokens.create!(email: email, scope: EmailToken.scopes[:email_update]) + send_email(:confirm_new_email, @change_req.new_email_token) end - change_req.save! + @change_req.save! + @change_req end def confirm(token) confirm_result = nil User.transaction do - result = EmailToken.atomic_confirm(token) - if result[:success] - token = result[:email_token] - @user = token.user - - change_req = @user.email_change_requests - .where('old_email_token_id = :token_id OR new_email_token_id = :token_id', token_id: token.id) - .first - - case change_req.try(:change_state) - when EmailChangeRequest.states[:authorizing_old] - change_req.update!( - change_state: EmailChangeRequest.states[:authorizing_new], - new_email_token: @user.email_tokens.create(email: change_req.new_email) - ) - send_email(:confirm_new_email, change_req.new_email_token) - confirm_result = :authorizing_new - when EmailChangeRequest.states[:authorizing_new] - change_req.update!(change_state: EmailChangeRequest.states[:complete]) - if !@user.staff? - # Send an email notification only to users who did not confirm old - # email. - send_email_notification(change_req.old_email, change_req.new_email) - end - update_user_email(change_req.old_email, change_req.new_email) - confirm_result = :complete - end - else + email_token = EmailToken.confirmable(token, scope: EmailToken.scopes[:email_update]) + if email_token.blank? errors.add(:base, I18n.t('change_email.already_done')) confirm_result = :error + next + end + + email_token.update!(confirmed: true) + + @user = email_token.user + @change_req = @user.email_change_requests + .where('old_email_token_id = :token_id OR new_email_token_id = :token_id', token_id: email_token.id) + .first + + case @change_req.try(:change_state) + when EmailChangeRequest.states[:authorizing_old] + @change_req.update!( + change_state: EmailChangeRequest.states[:authorizing_new], + new_email_token: @user.email_tokens.create!(email: @change_req.new_email, scope: EmailToken.scopes[:email_update]) + ) + send_email(:confirm_new_email, @change_req.new_email_token) + confirm_result = :authorizing_new + when EmailChangeRequest.states[:authorizing_new] + @change_req.update!(change_state: EmailChangeRequest.states[:complete]) + if !@user.staff? + # Send an email notification only to users who did not confirm old + # email. + send_email_notification(@change_req.old_email, @change_req.new_email) + end + update_user_email(@change_req.old_email, @change_req.new_email) + confirm_result = :complete end end diff --git a/lib/tasks/admin.rake b/lib/tasks/admin.rake index d730ed66fe..0c95b07001 100644 --- a/lib/tasks/admin.rake +++ b/lib/tasks/admin.rake @@ -27,7 +27,7 @@ task "admin:invite", [:email] => [:environment] do |_, args| user.email_tokens.update_all confirmed: true puts "Sending email!" - email_token = user.email_tokens.create(email: user.email) + email_token = user.email_tokens.create!(email: user.email, scope: EmailToken.scopes[:signup]) Jobs.enqueue(:user_email, type: :account_created, user_id: user.id, email_token: email_token.token) end diff --git a/spec/components/email_updater_spec.rb b/spec/components/email_updater_spec.rb index f70c009b50..e3294c9c27 100644 --- a/spec/components/email_updater_spec.rb +++ b/spec/components/email_updater_spec.rb @@ -47,22 +47,20 @@ describe EmailUpdater do it "logs the admin user as the requester" do updater.change_to(new_email) - @change_req = user.email_change_requests.first - expect(@change_req.requested_by).to eq(admin) + expect(updater.change_req.requested_by).to eq(admin) end it "starts the new confirmation process" do updater.change_to(new_email) - @change_req = user.email_change_requests.first expect(updater.errors).to be_blank - expect(@change_req).to be_present - expect(@change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_new]) + expect(updater.change_req).to be_present + expect(updater.change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_new]) - expect(@change_req.old_email).to eq(old_email) - expect(@change_req.new_email).to eq(new_email) - expect(@change_req.old_email_token).to be_blank - expect(@change_req.new_email_token.email).to eq(new_email) + expect(updater.change_req.old_email).to eq(old_email) + expect(updater.change_req.new_email).to eq(new_email) + expect(updater.change_req.old_email_token).to be_blank + expect(updater.change_req.new_email_token.email).to eq(new_email) end end @@ -73,24 +71,22 @@ describe EmailUpdater do expect_enqueued_with(job: :critical_user_email, args: { type: :confirm_old_email, to_address: old_email }) do updater.change_to(new_email) end - - @change_req = user.email_change_requests.first end it "starts the old confirmation process" do expect(updater.errors).to be_blank - expect(@change_req.old_email).to eq(old_email) - expect(@change_req.new_email).to eq(new_email) - expect(@change_req).to be_present - expect(@change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_old]) + expect(updater.change_req.old_email).to eq(old_email) + expect(updater.change_req.new_email).to eq(new_email) + expect(updater.change_req).to be_present + expect(updater.change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_old]) - expect(@change_req.old_email_token.email).to eq(old_email) - expect(@change_req.new_email_token).to be_blank + expect(updater.change_req.old_email_token.email).to eq(old_email) + expect(updater.change_req.new_email_token).to be_blank end it "does not immediately confirm the request" do - expect(@change_req.change_state).not_to eq(EmailChangeRequest.states[:complete]) + expect(updater.change_req.change_state).not_to eq(EmailChangeRequest.states[:complete]) end end @@ -103,30 +99,27 @@ describe EmailUpdater do expect_enqueued_with(job: :critical_user_email, args: { type: :confirm_old_email, to_address: old_email }) do updater.change_to(new_email) end - - @change_req = user.email_change_requests.first end it "logs the user as the requester" do updater.change_to(new_email) - @change_req = user.email_change_requests.first - expect(@change_req.requested_by).to eq(user) + expect(updater.change_req.requested_by).to eq(user) end it "starts the old confirmation process" do expect(updater.errors).to be_blank - expect(@change_req.old_email).to eq(old_email) - expect(@change_req.new_email).to eq(new_email) - expect(@change_req).to be_present - expect(@change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_old]) + expect(updater.change_req.old_email).to eq(old_email) + expect(updater.change_req.new_email).to eq(new_email) + expect(updater.change_req).to be_present + expect(updater.change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_old]) - expect(@change_req.old_email_token.email).to eq(old_email) - expect(@change_req.new_email_token).to be_blank + expect(updater.change_req.old_email_token.email).to eq(old_email) + expect(updater.change_req.new_email_token).to be_blank end it "does not immediately confirm the request" do - expect(@change_req.change_state).not_to eq(EmailChangeRequest.states[:complete]) + expect(updater.change_req.change_state).not_to eq(EmailChangeRequest.states[:complete]) end end end @@ -140,20 +133,18 @@ describe EmailUpdater do expect_enqueued_with(job: :critical_user_email, args: { type: :confirm_new_email, to_address: new_email }) do updater.change_to(new_email) end - - @change_req = user.email_change_requests.first end it "starts the new confirmation process" do expect(updater.errors).to be_blank - expect(@change_req).to be_present - expect(@change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_new]) + expect(updater.change_req).to be_present + expect(updater.change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_new]) - expect(@change_req.old_email).to eq(old_email) - expect(@change_req.new_email).to eq(new_email) - expect(@change_req.old_email_token).to be_blank - expect(@change_req.new_email_token.email).to eq(new_email) + expect(updater.change_req.old_email).to eq(old_email) + expect(updater.change_req.new_email).to eq(new_email) + expect(updater.change_req.old_email_token).to be_blank + expect(updater.change_req.new_email_token.email).to eq(new_email) end context 'confirming an invalid token' do @@ -168,7 +159,7 @@ describe EmailUpdater do it "updates the user's email" do event = DiscourseEvent.track_events { expect_enqueued_with(job: :critical_user_email, args: { type: :notify_old_email, to_address: old_email }) do - updater.confirm(@change_req.new_email_token.token) + updater.confirm(updater.change_req.new_email_token.token) end }.last @@ -178,8 +169,8 @@ describe EmailUpdater do expect(event[:event_name]).to eq(:user_updated) expect(event[:params].first).to eq(user) - @change_req.reload - expect(@change_req.change_state).to eq(EmailChangeRequest.states[:complete]) + updater.change_req.reload + expect(updater.change_req.change_state).to eq(EmailChangeRequest.states[:complete]) end end end @@ -189,8 +180,6 @@ describe EmailUpdater do expect_enqueued_with(job: :critical_user_email, args: { type: :confirm_new_email, to_address: new_email }) do updater.change_to(new_email, add: true) end - - @change_req = user.email_change_requests.first end context 'confirming a valid token' do @@ -199,7 +188,7 @@ describe EmailUpdater do event = DiscourseEvent.track_events { expect_enqueued_with(job: :critical_user_email, args: { type: :notify_old_email_add, to_address: old_email }) do - updater.confirm(@change_req.new_email_token.token) + updater.confirm(updater.change_req.new_email_token.token) end }.last @@ -209,15 +198,15 @@ describe EmailUpdater do expect(event[:event_name]).to eq(:user_updated) expect(event[:params].first).to eq(user) - @change_req.reload - expect(@change_req.change_state).to eq(EmailChangeRequest.states[:complete]) + updater.change_req.reload + expect(updater.change_req.change_state).to eq(EmailChangeRequest.states[:complete]) end end context 'that was deleted before' do it 'works' do expect_enqueued_with(job: :critical_user_email, args: { type: :notify_old_email_add, to_address: old_email }) do - updater.confirm(@change_req.new_email_token.token) + updater.confirm(updater.change_req.new_email_token.token) end expect(user.reload.user_emails.pluck(:email)).to contain_exactly(old_email, new_email) @@ -229,10 +218,8 @@ describe EmailUpdater do updater.change_to(new_email, add: true) end - @change_req = user.email_change_requests.first - expect_enqueued_with(job: :critical_user_email, args: { type: :notify_old_email_add, to_address: old_email }) do - updater.confirm(@change_req.new_email_token.token) + updater.confirm(updater.change_req.new_email_token.token) end expect(user.reload.user_emails.pluck(:email)).to contain_exactly(old_email, new_email) @@ -266,20 +253,18 @@ describe EmailUpdater do expect_enqueued_with(job: :critical_user_email, args: { type: :confirm_old_email, to_address: old_email }) do updater.change_to(new_email) end - - @change_req = user.email_change_requests.first end it "starts the old confirmation process" do expect(updater.errors).to be_blank - expect(@change_req.old_email).to eq(old_email) - expect(@change_req.new_email).to eq(new_email) - expect(@change_req).to be_present - expect(@change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_old]) + expect(updater.change_req.old_email).to eq(old_email) + expect(updater.change_req.new_email).to eq(new_email) + expect(updater.change_req).to be_present + expect(updater.change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_old]) - expect(@change_req.old_email_token.email).to eq(old_email) - expect(@change_req.new_email_token).to be_blank + expect(updater.change_req.old_email_token.email).to eq(old_email) + expect(updater.change_req.new_email_token).to be_blank end context 'confirming an invalid token' do @@ -293,34 +278,33 @@ describe EmailUpdater do context 'confirming a valid token' do before do expect_enqueued_with(job: :critical_user_email, args: { type: :confirm_new_email, to_address: new_email }) do - updater.confirm(@change_req.old_email_token.token) + @old_token = updater.change_req.old_email_token.token + updater.confirm(@old_token) end - - @change_req.reload end it "starts the new update process" do expect(updater.errors).to be_blank expect(user.reload.email).to eq(old_email) - expect(@change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_new]) - expect(@change_req.new_email_token).to be_present + expect(updater.change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_new]) + expect(updater.change_req.new_email_token).to be_present end it "cannot be confirmed twice" do - updater.confirm(@change_req.old_email_token.token) + updater.confirm(@old_token) expect(updater.errors).to be_present expect(user.reload.email).to eq(old_email) - @change_req.reload - expect(@change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_new]) - expect(@change_req.new_email_token.email).to eq(new_email) + updater.change_req.reload + expect(updater.change_req.change_state).to eq(EmailChangeRequest.states[:authorizing_new]) + expect(updater.change_req.new_email_token.email).to eq(new_email) end context "completing the new update process" do before do expect_not_enqueued_with(job: :critical_user_email, args: { type: :notify_old_email, to_address: old_email }) do - updater.confirm(@change_req.new_email_token.token) + updater.confirm(updater.change_req.new_email_token.token) end end @@ -328,8 +312,8 @@ describe EmailUpdater do expect(updater.errors).to be_blank expect(user.reload.email).to eq(new_email) - @change_req.reload - expect(@change_req.change_state).to eq(EmailChangeRequest.states[:complete]) + updater.change_req.reload + expect(updater.change_req.change_state).to eq(EmailChangeRequest.states[:complete]) end end end diff --git a/spec/fabricators/email_token_fabricator.rb b/spec/fabricators/email_token_fabricator.rb index a1ae1cbd9d..c2ec17d3b5 100644 --- a/spec/fabricators/email_token_fabricator.rb +++ b/spec/fabricators/email_token_fabricator.rb @@ -3,4 +3,5 @@ Fabricator(:email_token) do user email { |attrs| attrs[:user].email } + scope EmailToken.scopes[:signup] end diff --git a/spec/jobs/automatic_group_membership_spec.rb b/spec/jobs/automatic_group_membership_spec.rb index 304b43c250..250e12b137 100644 --- a/spec/jobs/automatic_group_membership_spec.rb +++ b/spec/jobs/automatic_group_membership_spec.rb @@ -12,9 +12,9 @@ describe Jobs::AutomaticGroupMembership do user1 = Fabricate(:user, email: "no@bar.com") user2 = Fabricate(:user, email: "no@wat.com") user3 = Fabricate(:user, email: "noo@wat.com", staged: true) - EmailToken.confirm(user3.email_tokens.last.token) + EmailToken.confirm(Fabricate(:email_token, user: user3).token) user4 = Fabricate(:user, email: "yes@wat.com") - EmailToken.confirm(user4.email_tokens.last.token) + EmailToken.confirm(Fabricate(:email_token, user: user4).token) user5 = Fabricate(:user, email: "sso@wat.com") user5.create_single_sign_on_record(external_id: 123, external_email: "hacker@wat.com", last_payload: "") user6 = Fabricate(:user, email: "sso2@wat.com") diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb index e186b8d6d2..907b356cab 100644 --- a/spec/mailers/user_notifications_spec.rb +++ b/spec/mailers/user_notifications_spec.rb @@ -121,7 +121,7 @@ describe UserNotifications do end describe '.email_login' do - let(:email_token) { user.email_tokens.create!(email: user.email).token } + let(:email_token) { Fabricate(:email_token, user: user, scope: EmailToken.scopes[:email_login]).token } subject { UserNotifications.email_login(user, email_token: email_token) } it "generates the right email" do diff --git a/spec/models/email_token_spec.rb b/spec/models/email_token_spec.rb index aa6dfac6d7..92ad1e55c4 100644 --- a/spec/models/email_token_spec.rb +++ b/spec/models/email_token_spec.rb @@ -3,7 +3,6 @@ require 'rails_helper' describe EmailToken do - it { is_expected.to validate_presence_of :user_id } it { is_expected.to validate_presence_of :email } it { is_expected.to belong_to :user } @@ -11,14 +10,14 @@ describe EmailToken do context '#create' do fab!(:user) { Fabricate(:user, active: false) } let!(:original_token) { user.email_tokens.first } - let!(:email_token) { user.email_tokens.create(email: 'bubblegum@adventuretime.ooo') } + let!(:email_token) { Fabricate(:email_token, user: user, email: 'bubblegum@adventuretime.ooo') } it 'should create the email token' do expect(email_token).to be_present end it 'should downcase the email' do - token = user.email_tokens.create(email: "UpperCaseSoWoW@GMail.com") + token = Fabricate(:email_token, user: user, email: "UpperCaseSoWoW@GMail.com") expect(token.email).to eq "uppercasesowow@gmail.com" end @@ -45,20 +44,15 @@ describe EmailToken do end context '#confirm' do - fab!(:user) { Fabricate(:user, active: false) } - let(:email_token) { user.email_tokens.first } + let!(:email_token) { Fabricate(:email_token, user: user) } it 'returns nil with a nil token' do expect(EmailToken.confirm(nil)).to be_blank end - it 'returns nil with a made up token' do - expect(EmailToken.confirm(EmailToken.generate_token)).to be_blank - end - - it 'returns nil unless the token is the right length' do - expect(EmailToken.confirm('a')).to be_blank + it 'returns nil with an invalid token' do + expect(EmailToken.confirm("random token")).to be_blank end it 'returns nil when a token is expired' do @@ -73,7 +67,6 @@ describe EmailToken do end context 'taken email address' do - before do @other_user = Fabricate(:coding_horror) email_token.update_attribute :email, @other_user.email @@ -82,7 +75,6 @@ describe EmailToken do it 'returns nil when the email has been taken since the token has been generated' do expect(EmailToken.confirm(email_token.token)).to be_blank end - end context 'welcome message' do @@ -94,7 +86,6 @@ describe EmailToken do end context 'success' do - let!(:confirmed_user) { EmailToken.confirm(email_token.token) } it "returns the correct user" do @@ -124,7 +115,7 @@ describe EmailToken do fab!(:invite) { Fabricate(:invite, email: 'test@example.com') } fab!(:invited_user) { Fabricate(:user, active: false, email: invite.email) } - let(:user_email_token) { invited_user.email_tokens.first } + let!(:user_email_token) { Fabricate(:email_token, user: invited_user) } let!(:confirmed_invited_user) { EmailToken.confirm(user_email_token.token) } it "returns the correct user" do @@ -151,5 +142,4 @@ describe EmailToken do end end end - end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 1a6a22588a..7113318e6e 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -234,7 +234,7 @@ describe User do reviewable = ReviewableUser.find_by(target: user) expect(reviewable).to be_blank - EmailToken.confirm(user.email_tokens.first.token) + EmailToken.confirm(Fabricate(:email_token, user: user).token) expect(user.reload.active).to eq(true) reviewable = ReviewableUser.find_by(target: user) expect(reviewable).to be_present @@ -876,7 +876,7 @@ describe User do expect(@user.active).to eq(false) expect(@user.confirm_password?("ilovepasta")).to eq(true) - email_token = @user.email_tokens.create(email: 'pasta@delicious.com') + email_token = Fabricate(:email_token, user: @user, email: 'pasta@delicious.com') UserAuthToken.generate!(user_id: @user.id) @@ -1073,7 +1073,7 @@ describe User do context 'when email has been confirmed' do it 'should return true' do - token = user.email_tokens.find_by(email: user.email) + token = Fabricate(:email_token, user: user) EmailToken.confirm(token.token) expect(user.email_confirmed?).to eq(true) end @@ -1549,14 +1549,14 @@ describe User do it "doesn't automatically add staged users" do staged_user = Fabricate(:user, active: true, staged: true, email: "wat@wat.com") - EmailToken.confirm(staged_user.email_tokens.last.token) + EmailToken.confirm(Fabricate(:email_token, user: staged_user).token) group.reload expect(group.users.include?(staged_user)).to eq(false) end it "is automatically added to a group when the email matches" do user = Fabricate(:user, active: true, email: "foo@bar.com") - EmailToken.confirm(user.email_tokens.last.token) + EmailToken.confirm(Fabricate(:email_token, user: user).token) group.reload expect(group.users.include?(user)).to eq(true) @@ -1585,7 +1585,7 @@ describe User do user.password_required! user.save! - EmailToken.confirm(user.email_tokens.last.token) + EmailToken.confirm(Fabricate(:email_token, user: user).token) user.reload expect(user.title).to eq("bars and wats") diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb index fd8ed07966..73d7c62f69 100644 --- a/spec/models/web_hook_spec.rb +++ b/spec/models/web_hook_spec.rb @@ -333,7 +333,7 @@ describe WebHook do payload = JSON.parse(job_args["payload"]) expect(payload["id"]).to eq(user.id) - email_token = user.email_tokens.create(email: user.email) + email_token = Fabricate(:email_token, user: user) EmailToken.confirm(email_token.token) job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index 2489d79f77..e651df4c1f 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -567,11 +567,13 @@ describe 'users' do expected_response_schema = nil let(:user) { Fabricate(:user) } - let(:token) { user.email_tokens.create(email: user.email).token } - let(:params) { { - 'username' => user.username, - 'password' => 'NH8QYbxYS5Zv5qEFzA4jULvM' - } } + let(:token) { Fabricate(:email_token, user: user, scope: EmailToken.scopes[:password_reset]).token } + let(:params) do + { + 'username' => user.username, + 'password' => 'NH8QYbxYS5Zv5qEFzA4jULvM' + } + end it_behaves_like "a JSON endpoint", 200 do let(:expected_response_schema) { expected_response_schema } diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb index c4684a182e..073ef1a88f 100644 --- a/spec/requests/session_controller_spec.rb +++ b/spec/requests/session_controller_spec.rb @@ -3,10 +3,9 @@ require 'rails_helper' require 'rotp' -RSpec.describe SessionController do - let(:email_token) { Fabricate(:email_token) } - let(:user) { email_token.user } - let(:logo_fixture) { "http://#{Discourse.current_hostname}/uploads/logo.png" } +describe SessionController do + let(:user) { Fabricate(:user) } + let(:email_token) { Fabricate(:email_token, user: user) } shared_examples 'failed to continue local login' do it 'should return the right response' do @@ -16,6 +15,8 @@ RSpec.describe SessionController do end describe '#email_login_info' do + let(:email_token) { Fabricate(:email_token, user: user, scope: EmailToken.scopes[:email_login]) } + before do SiteSetting.enable_local_logins_via_email = true end @@ -118,6 +119,8 @@ RSpec.describe SessionController do end describe '#email_login' do + let(:email_token) { Fabricate(:email_token, user: user, scope: EmailToken.scopes[:email_login]) } + before do SiteSetting.enable_local_logins_via_email = true end @@ -200,7 +203,6 @@ RSpec.describe SessionController do post "/session/email-login/#{email_token.token}.json" expect(response.status).to eq(200) - expect(response.parsed_body["error"]).to eq(I18n.t("login.not_approved")) expect(session[:current_user_id]).to eq(nil) end @@ -1112,6 +1114,8 @@ RSpec.describe SessionController do let(:headers) { { host: Discourse.current_hostname } } describe 'can act as an SSO provider' do + let(:logo_fixture) { "http://#{Discourse.current_hostname}/uploads/logo.png" } + before do stub_request(:any, /#{Discourse.current_hostname}\/uploads/).to_return( status: 200, @@ -1315,8 +1319,6 @@ RSpec.describe SessionController do end describe '#create' do - let(:user) { Fabricate(:user) } - context 'local login is disabled' do before do SiteSetting.enable_local_logins = false @@ -1354,8 +1356,7 @@ RSpec.describe SessionController do context 'when email is confirmed' do before do - token = user.email_tokens.find_by(email: user.email) - EmailToken.confirm(token.token) + EmailToken.confirm(email_token.token) end it "raises an error when the login isn't present" do @@ -1508,6 +1509,7 @@ RSpec.describe SessionController do )) end end + context "when the security key params are invalid" do it "shows an error message and denies login" do @@ -1532,9 +1534,9 @@ RSpec.describe SessionController do )) end end + context "when the security key params are valid" do it "logs the user in" do - post "/session.json", params: { login: user.username, password: 'myawesomepassword', @@ -1549,6 +1551,7 @@ RSpec.describe SessionController do expect(user.user_auth_tokens.count).to eq(1) end end + context "when the security key is disabled in the background by the user and TOTP is enabled" do before do user_security_key.destroy! @@ -1556,7 +1559,6 @@ RSpec.describe SessionController do end it "shows an error message and denies login" do - post "/session.json", params: { login: user.username, password: 'myawesomepassword', @@ -1609,6 +1611,7 @@ RSpec.describe SessionController do )) end end + context 'when using backup code method' do it 'should return the right response' do post "/session.json", params: { @@ -1646,6 +1649,7 @@ RSpec.describe SessionController do .to eq(user.user_auth_tokens.first.auth_token) end end + context 'when using backup code method' do it 'should log the user in' do post "/session.json", params: { diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index e436e9f2b1..bbe67e69ad 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -42,12 +42,7 @@ describe UsersController do end describe '#perform_account_activation' do - let(:token) do - return @token if @token.present? - email_token = EmailToken.create!(expired: false, confirmed: false, user: user, email: user.email) - @token = email_token.token - @token - end + let(:email_token) { Fabricate(:email_token, user: user) } before do UsersController.any_instance.stubs(:honeypot_or_challenge_fails?).returns(false) @@ -66,7 +61,7 @@ describe UsersController do it 'enqueues a welcome message if the user object indicates so' do SiteSetting.send_welcome_message = true user.update(active: false) - put "/u/activate-account/#{token}" + put "/u/activate-account/#{email_token.token}" expect(response.status).to eq(200) expect(Jobs::SendSystemMessage.jobs.size).to eq(1) expect(Jobs::SendSystemMessage.jobs.first["args"].first["message_type"]).to eq("welcome_user") @@ -74,7 +69,7 @@ describe UsersController do it "doesn't enqueue the welcome message if the object returns false" do user.update(active: true) - put "/u/activate-account/#{token}" + put "/u/activate-account/#{email_token.token}" expect(response.status).to eq(200) expect(Jobs::SendSystemMessage.jobs.size).to eq(0) end @@ -83,24 +78,21 @@ describe UsersController do context "honeypot" do it "raises an error if the honeypot is invalid" do UsersController.any_instance.stubs(:honeypot_or_challenge_fails?).returns(true) - put "/u/activate-account/#{token}" + put "/u/activate-account/#{email_token.token}" expect(response.status).to eq(403) end end context 'response' do - before do - Guardian.any_instance.expects(:can_access_forum?).returns(true) - EmailToken.expects(:confirm).with("#{token}").returns(user) - end - it 'correctly logs on user' do + email_token + events = DiscourseEvent.track_events do - put "/u/activate-account/#{token}" + put "/u/activate-account/#{email_token.token}" end expect(events.map { |event| event[:event_name] }).to contain_exactly( - :user_logged_in, :user_first_logged_in + :user_confirmed_email, :user_first_logged_in, :user_logged_in ) expect(response.status).to eq(200) @@ -115,11 +107,10 @@ describe UsersController do context 'user is not approved' do before do SiteSetting.must_approve_users = true - EmailToken.expects(:confirm).with("#{token}").returns(user) - put "/u/activate-account/#{token}" end it 'should return the right response' do + put "/u/activate-account/#{email_token.token}" expect(response.status).to eq(200) expect(CGI.unescapeHTML(response.body)) @@ -140,7 +131,7 @@ describe UsersController do destination_url = 'http://thisisasite.com/somepath' cookies[:destination_url] = destination_url - put "/u/activate-account/#{token}" + put "/u/activate-account/#{email_token.token}" expect(response).to redirect_to(destination_url) end @@ -211,23 +202,21 @@ describe UsersController do end context 'valid token' do + let!(:user) { Fabricate(:user) } + let!(:user_auth_token) { UserAuthToken.generate!(user_id: user.id) } + let!(:email_token) { Fabricate(:email_token, user: user, scope: EmailToken.scopes[:password_reset]) } + context 'when rendered' do it 'renders referrer never on get requests' do - user = Fabricate(:user) - token = user.email_tokens.create(email: user.email).token - get "/u/password-reset/#{token}" + get "/u/password-reset/#{email_token.token}" expect(response.status).to eq(200) expect(response.body).to include('') end end it 'returns success' do - user = Fabricate(:user) - user_auth_token = UserAuthToken.generate!(user_id: user.id) - token = user.email_tokens.create(email: user.email).token - events = DiscourseEvent.track_events do - put "/u/password-reset/#{token}", params: { password: 'hg9ow8yhg98o' } + put "/u/password-reset/#{email_token.token}", params: { password: 'hg9ow8yhg98o' } end expect(events.map { |event| event[:event_name] }).to contain_exactly( @@ -240,87 +229,57 @@ describe UsersController do expect(json['password_reset']).to include('{"is_developer":false,"admin":false,"second_factor_required":false,"security_key_required":false,"backup_enabled":false,"multiple_second_factor_methods":false}') end - expect(session["password-#{token}"]).to be_blank + expect(session["password-#{email_token.token}"]).to be_blank expect(UserAuthToken.where(id: user_auth_token.id).count).to eq(0) end it 'disallows double password reset' do - user = Fabricate(:user) - token = user.email_tokens.create(email: user.email).token - - put "/u/password-reset/#{token}", params: { password: 'hg9ow8yHG32O' } - - put "/u/password-reset/#{token}", params: { password: 'test123987AsdfXYZ' } - - user.reload - expect(user.confirm_password?('hg9ow8yHG32O')).to eq(true) - - # logged in now + put "/u/password-reset/#{email_token.token}", params: { password: 'hg9ow8yHG32O' } + put "/u/password-reset/#{email_token.token}", params: { password: 'test123987AsdfXYZ' } + expect(user.reload.confirm_password?('hg9ow8yHG32O')).to eq(true) expect(user.user_auth_tokens.count).to eq(1) end it "doesn't redirect to wizard on get" do - user = Fabricate(:admin) - UserAuthToken.generate!(user_id: user.id) + user.update!(admin: true) - token = user.email_tokens.create(email: user.email).token - get "/u/password-reset/#{token}.json" + get "/u/password-reset/#{email_token.token}.json" expect(response).not_to redirect_to(wizard_path) end it "redirects to the wizard if you're the first admin" do - user = Fabricate(:admin) - UserAuthToken.generate!(user_id: user.id) - - token = user.email_tokens.create(email: user.email).token - get "/u/password-reset/#{token}" - - put "/u/password-reset/#{token}", params: { password: 'hg9ow8yhg98oadminlonger' } + user.update!(admin: true) + get "/u/password-reset/#{email_token.token}" + put "/u/password-reset/#{email_token.token}", params: { password: 'hg9ow8yhg98oadminlonger' } expect(response).to redirect_to(wizard_path) end it "sets the users timezone if the param is present" do - user = Fabricate(:admin) - UserAuthToken.generate!(user_id: user.id) - - token = user.email_tokens.create(email: user.email).token - get "/u/password-reset/#{token}" - + get "/u/password-reset/#{email_token.token}" expect(user.user_option.timezone).to eq(nil) - put "/u/password-reset/#{token}", params: { password: 'hg9ow8yhg98oadminlonger', timezone: "America/Chicago" } + + put "/u/password-reset/#{email_token.token}", params: { password: 'hg9ow8yhg98oadminlonger', timezone: "America/Chicago" } expect(user.user_option.reload.timezone).to eq("America/Chicago") end it "logs the password change" do - user = Fabricate(:admin) - UserAuthToken.generate!(user_id: user.id) - token = user.email_tokens.create(email: user.email).token - get "/u/password-reset/#{token}" + get "/u/password-reset/#{email_token.token}" expect do - put "/u/password-reset/#{token}", params: { password: 'hg9ow8yhg98oadminlonger' } + put "/u/password-reset/#{email_token.token}", params: { password: 'hg9ow8yhg98oadminlonger' } end.to change { UserHistory.count }.by (1) - entry = UserHistory.last - - expect(entry.target_user_id).to eq(user.id) - expect(entry.action).to eq(UserHistory.actions[:change_password]) + user_history = UserHistory.last + expect(user_history.target_user_id).to eq(user.id) + expect(user_history.action).to eq(UserHistory.actions[:change_password]) end it "doesn't invalidate the token when loading the page" do - user = Fabricate(:user) - user_token = UserAuthToken.generate!(user_id: user.id) - - email_token = user.email_tokens.create(email: user.email) - get "/u/password-reset/#{email_token.token}.json" expect(response.status).to eq(200) - - email_token.reload - - expect(email_token.confirmed).to eq(false) - expect(UserAuthToken.where(id: user_token.id).count).to eq(1) + expect(email_token.reload.confirmed).to eq(false) + expect(UserAuthToken.where(id: user_auth_token.id).count).to eq(1) end context "rate limiting" do @@ -329,10 +288,8 @@ describe UsersController do it "rate limits reset passwords" do freeze_time - token = user.email_tokens.create!(email: user.email).token - 6.times do - put "/u/password-reset/#{token}", params: { + put "/u/password-reset/#{email_token.token}", params: { second_factor_token: 123456, second_factor_method: 1 } @@ -340,7 +297,7 @@ describe UsersController do expect(response.status).to eq(200) end - put "/u/password-reset/#{token}", params: { + put "/u/password-reset/#{email_token.token}", params: { second_factor_token: 123456, second_factor_method: 1 } @@ -351,10 +308,8 @@ describe UsersController do it "rate limits reset passwords by username" do freeze_time - token = user.email_tokens.create!(email: user.email).token - 6.times do |x| - put "/u/password-reset/#{token}", params: { + put "/u/password-reset/#{email_token.token}", params: { second_factor_token: 123456, second_factor_method: 1 }, env: { "REMOTE_ADDR": "1.2.3.#{x}" } @@ -362,7 +317,7 @@ describe UsersController do expect(response.status).to eq(200) end - put "/u/password-reset/#{token}", params: { + put "/u/password-reset/#{email_token.token}", params: { second_factor_token: 123456, second_factor_method: 1 }, env: { "REMOTE_ADDR": "1.2.3.4" } @@ -375,16 +330,16 @@ describe UsersController do let!(:second_factor) { Fabricate(:user_second_factor_totp, user: user) } it 'does not change with an invalid token' do - token = user.email_tokens.create!(email: user.email).token + user.user_auth_tokens.destroy_all - get "/u/password-reset/#{token}" + get "/u/password-reset/#{email_token.token}" expect(response.body).to have_tag("div#data-preloaded") do |element| json = JSON.parse(element.current_scope.attribute('data-preloaded').value) expect(json['password_reset']).to include('{"is_developer":false,"admin":false,"second_factor_required":true,"security_key_required":false,"backup_enabled":false,"multiple_second_factor_methods":false}') end - put "/u/password-reset/#{token}", params: { + put "/u/password-reset/#{email_token.token}", params: { password: 'hg9ow8yHG32O', second_factor_token: '000000', second_factor_method: UserSecondFactor.methods[:totp] @@ -398,11 +353,9 @@ describe UsersController do end it 'changes password with valid 2-factor tokens' do - token = user.email_tokens.create(email: user.email).token + get "/u/password-reset/#{email_token.token}" - get "/u/password-reset/#{token}" - - put "/u/password-reset/#{token}", params: { + put "/u/password-reset/#{email_token.token}", params: { password: 'hg9ow8yHG32O', second_factor_token: ROTP::TOTP.new(second_factor.data).now, second_factor_method: UserSecondFactor.methods[:totp] @@ -424,13 +377,12 @@ describe UsersController do public_key: valid_security_key_data[:public_key] ) end - let(:token) { user.email_tokens.create!(email: user.email).token } before do simulate_localhost_webauthn_challenge # store challenge in secure session by visiting the email login page - get "/u/password-reset/#{token}" + get "/u/password-reset/#{email_token.token}" end it 'preloads with a security key challenge and allowed credential ids' do @@ -450,34 +402,32 @@ describe UsersController do end it 'changes password with valid security key challenge and authentication' do - put "/u/password-reset/#{token}.json", params: { + put "/u/password-reset/#{email_token.token}.json", params: { password: 'hg9ow8yHG32O', second_factor_token: valid_security_key_auth_post_data, second_factor_method: UserSecondFactor.methods[:security_key] } - user.reload expect(response.status).to eq(200) - + user.reload expect(user.confirm_password?('hg9ow8yHG32O')).to eq(true) expect(user.user_auth_tokens.count).to eq(1) end it "does not change a password if a fake TOTP token is provided" do - put "/u/password-reset/#{token}.json", params: { + put "/u/password-reset/#{email_token.token}.json", params: { password: 'hg9ow8yHG32O', second_factor_token: 'blah', second_factor_method: UserSecondFactor.methods[:security_key] } - user.reload expect(response.status).to eq(200) - expect(user.confirm_password?('hg9ow8yHG32O')).to eq(false) + expect(user.reload.confirm_password?('hg9ow8yHG32O')).to eq(false) end context "when security key authentication fails" do it 'shows an error message and does not change password' do - put "/u/password-reset/#{token}", params: { + put "/u/password-reset/#{email_token.token}", params: { password: 'hg9ow8yHG32O', second_factor_token: { signature: 'bad', @@ -488,24 +438,19 @@ describe UsersController do second_factor_method: UserSecondFactor.methods[:security_key] } - user.reload - expect(user.confirm_password?('hg9ow8yHG32O')).to eq(false) expect(response.status).to eq(200) expect(response.body).to include(I18n.t("webauthn.validation.not_found_error")) + expect(user.reload.confirm_password?('hg9ow8yHG32O')).to eq(false) end end end end context 'submit change' do - let(:token) { EmailToken.generate_token } - - before do - EmailToken.expects(:confirm).with(token).returns(user) - end + let(:email_token) { Fabricate(:email_token, user: user, scope: EmailToken.scopes[:password_reset]) } it "fails when the password is blank" do - put "/u/password-reset/#{token}.json", params: { password: '' } + put "/u/password-reset/#{email_token.token}.json", params: { password: '' } expect(response.status).to eq(200) expect(response.parsed_body["errors"]).to be_present @@ -513,7 +458,7 @@ describe UsersController do end it "fails when the password is too long" do - put "/u/password-reset/#{token}.json", params: { password: ('x' * (User.max_password_length + 1)) } + put "/u/password-reset/#{email_token.token}.json", params: { password: ('x' * (User.max_password_length + 1)) } expect(response.status).to eq(200) expect(response.parsed_body["errors"]).to be_present @@ -521,7 +466,7 @@ describe UsersController do end it "logs in the user" do - put "/u/password-reset/#{token}.json", params: { password: 'ksjafh928r' } + put "/u/password-reset/#{email_token.token}.json", params: { password: 'ksjafh928r' } expect(response.status).to eq(200) expect(response.parsed_body["errors"]).to be_blank @@ -530,8 +475,9 @@ describe UsersController do it "doesn't log in the user when not approved" do SiteSetting.must_approve_users = true + user.update!(approved: false) - put "/u/password-reset/#{token}.json", params: { password: 'ksjafh928r' } + put "/u/password-reset/#{email_token.token}.json", params: { password: 'ksjafh928r' } expect(response.parsed_body["errors"]).to be_blank expect(session[:current_user_id]).to be_blank end @@ -540,16 +486,15 @@ describe UsersController do describe '#confirm_email_token' do fab!(:user) { Fabricate(:user) } + let!(:email_token) { Fabricate(:email_token, user: user) } it "token doesn't match any records" do - email_token = user.email_tokens.create(email: user.email) get "/u/confirm-email-token/#{SecureRandom.hex}.json" expect(response.status).to eq(200) expect(email_token.reload.confirmed).to eq(false) end it "token matches" do - email_token = user.email_tokens.create(email: user.email) get "/u/confirm-email-token/#{email_token.token}.json" expect(response.status).to eq(200) expect(email_token.reload.confirmed).to eq(true) @@ -833,18 +778,13 @@ describe UsersController do expect(Jobs::SendSystemMessage.jobs.size).to eq(0) expect(response.status).to eq(200) - json = response.parsed_body - - new_user = User.find(json["user_id"]) - email_token = new_user.email_tokens.active.where(email: new_user.email).first - - expect(json['active']).to be_truthy - + expect(response.parsed_body['active']).to be_truthy + new_user = User.find(response.parsed_body["user_id"]) expect(new_user.active).to eq(true) expect(new_user.approved).to eq(true) expect(new_user.approved_by_id).to eq(admin.id) expect(new_user.approved_at).to_not eq(nil) - expect(email_token.confirmed?).to eq(true) + expect(new_user.email_tokens.where(confirmed: true, email: new_user.email)).to exist end it "will create a reviewable when a user is created as active but not approved" do @@ -2358,7 +2298,7 @@ describe UsersController do context 'for an activated account with email confirmed' do it 'fails' do user = post_user - email_token = user.email_tokens.create(email: user.email).token + email_token = Fabricate(:email_token, user: user).token EmailToken.confirm(email_token) post "/u/action/send_activation_email.json", params: { username: user.username } @@ -2375,7 +2315,7 @@ describe UsersController do it 'should send an email' do user = post_user user.update!(active: true) - user.email_tokens.create!(email: user.email) + Fabricate(:email_token, user: user) expect_enqueued_with(job: :critical_user_email, args: { type: :signup, to_address: user.email }) do post "/u/action/send_activation_email.json", params: { @@ -2398,7 +2338,7 @@ describe UsersController do user = post_user user.update(active: true) user.save! - user.email_tokens.create(email: user.email) + Fabricate(:email_token, user: user) post "/u/action/send_activation_email.json", params: { username: user.username } @@ -4289,10 +4229,9 @@ describe UsersController do expect(response.parsed_body['user_found']).to eq(true) job_args = Jobs::CriticalUserEmail.jobs.last["args"].first - expect(job_args["user_id"]).to eq(user.id) expect(job_args["type"]).to eq("email_login") - expect(job_args["email_token"]).to eq(user.email_tokens.last.token) + expect(EmailToken.hash_token(job_args["email_token"])).to eq(user.email_tokens.last.token_hash) end describe 'when enable_local_logins_via_email is disabled' do diff --git a/spec/requests/users_email_controller_spec.rb b/spec/requests/users_email_controller_spec.rb index 046e618857..0b65943f7c 100644 --- a/spec/requests/users_email_controller_spec.rb +++ b/spec/requests/users_email_controller_spec.rb @@ -6,18 +6,19 @@ require 'rotp' describe UsersEmailController do fab!(:user) { Fabricate(:user) } + let!(:email_token) { Fabricate(:email_token, user: user) } fab!(:moderator) { Fabricate(:moderator) } describe "#confirm-new-email" do it 'does not redirect to login for signed out accounts, this route works fine as anon user' do - get "/u/confirm-new-email/asdfasdf" + get "/u/confirm-new-email/invalidtoken" expect(response.status).to eq(200) end it 'does not redirect to login for signed out accounts on login_required sites, this route works fine as anon user' do SiteSetting.login_required = true - get "/u/confirm-new-email/asdfasdf" + get "/u/confirm-new-email/invalidtoken" expect(response.status).to eq(200) end @@ -25,7 +26,7 @@ describe UsersEmailController do it 'errors out for invalid tokens' do sign_in(user) - get "/u/confirm-new-email/asdfasdf" + get "/u/confirm-new-email/invalidtoken" expect(response.status).to eq(200) expect(response.body).to include(I18n.t('change_email.already_done')) @@ -33,18 +34,14 @@ describe UsersEmailController do it 'does not change email if accounts mismatch for a signed in user' do updater = EmailUpdater.new(guardian: user.guardian, user: user) - updater.change_to('new.n.cool@example.com') + updater.change_to('bubblegum@adventuretime.ooo') old_email = user.email sign_in(moderator) - put "/u/confirm-new-email", params: { - token: "#{user.email_tokens.last.token}" - } - - user.reload - expect(user.email).to eq(old_email) + put "/u/confirm-new-email", params: { token: "#{email_token.token}" } + expect(user.reload.email).to eq(old_email) end context "with a valid user" do @@ -52,14 +49,14 @@ describe UsersEmailController do before do sign_in(user) - updater.change_to('new.n.cool@example.com') + updater.change_to('bubblegum@adventuretime.ooo') end it 'includes security_key_allowed_credential_ids in a hidden field' do key1 = Fabricate(:user_security_key_with_random_credential, user: user) key2 = Fabricate(:user_security_key_with_random_credential, user: user) - get "/u/confirm-new-email/#{user.email_tokens.last.token}" + get "/u/confirm-new-email/#{updater.change_req.new_email_token.token}" doc = Nokogiri::HTML5(response.body) credential_ids = doc.css("#security-key-allowed-credential-ids").first["value"].split(",") @@ -70,17 +67,15 @@ describe UsersEmailController do user.user_stat.update_columns(bounce_score: 42, reset_bounce_score_after: 1.week.from_now) put "/u/confirm-new-email", params: { - token: "#{user.email_tokens.last.token}" + token: "#{updater.change_req.new_email_token.token}" } expect(response.status).to eq(302) expect(response.redirect_url).to include("done") - user.reload - expect(user.user_stat.bounce_score).to eq(0) expect(user.user_stat.reset_bounce_score_after).to eq(nil) - expect(user.email).to eq("new.n.cool@example.com") + expect(user.email).to eq('bubblegum@adventuretime.ooo') end context 'second factor required' do @@ -88,29 +83,23 @@ describe UsersEmailController do fab!(:backup_code) { Fabricate(:user_second_factor_backup, user: user) } it 'requires a second factor token' do - get "/u/confirm-new-email/#{user.email_tokens.last.token}" + get "/u/confirm-new-email/#{updater.change_req.new_email_token.token}" expect(response.status).to eq(200) - - response_body = response.body - - expect(response_body).to include(I18n.t("login.second_factor_title")) - expect(response_body).not_to include(I18n.t("login.invalid_second_factor_code")) + expect(response.body).to include(I18n.t("login.second_factor_title")) + expect(response.body).not_to include(I18n.t("login.invalid_second_factor_code")) end it 'requires a backup token' do - get "/u/confirm-new-email/#{user.email_tokens.last.token}?show_backup=true" + get "/u/confirm-new-email/#{updater.change_req.new_email_token.token}?show_backup=true" expect(response.status).to eq(200) - - response_body = response.body - - expect(response_body).to include(I18n.t("login.second_factor_backup_title")) + expect(response.body).to include(I18n.t("login.second_factor_backup_title")) end it 'adds an error on a second factor attempt' do put "/u/confirm-new-email", params: { - token: user.email_tokens.last.token, + token: updater.change_req.new_email_token.token, second_factor_token: "000000", second_factor_method: UserSecondFactor.methods[:totp] } @@ -123,13 +112,11 @@ describe UsersEmailController do put "/u/confirm-new-email", params: { second_factor_token: ROTP::TOTP.new(second_factor.data).now, second_factor_method: UserSecondFactor.methods[:totp], - token: user.email_tokens.last.token + token: updater.change_req.new_email_token.token } expect(response.status).to eq(302) - - user.reload - expect(user.email).to eq("new.n.cool@example.com") + expect(user.reload.email).to eq('bubblegum@adventuretime.ooo') end context "rate limiting" do @@ -163,7 +150,7 @@ describe UsersEmailController do 6.times do |x| user.email_change_requests.last.update(change_state: EmailChangeRequest.states[:complete]) put "/u/confirm-new-email", params: { - token: user.email_tokens.last.token, + token: updater.change_req.new_email_token.token, second_factor_token: "000000", second_factor_method: UserSecondFactor.methods[:totp] }, env: { "REMOTE_ADDR": "1.2.3.#{x}" } @@ -173,7 +160,7 @@ describe UsersEmailController do user.email_change_requests.last.update(change_state: EmailChangeRequest.states[:authorizing_new]) put "/u/confirm-new-email", params: { - token: user.email_tokens.last.token, + token: updater.change_req.new_email_token.token, second_factor_token: "000000", second_factor_method: UserSecondFactor.methods[:totp] }, env: { "REMOTE_ADDR": "1.2.3.4" } @@ -198,14 +185,11 @@ describe UsersEmailController do end it 'requires a security key' do - get "/u/confirm-new-email/#{user.email_tokens.last.token}" + get "/u/confirm-new-email/#{updater.change_req.new_email_token.token}" expect(response.status).to eq(200) - - response_body = response.body - - expect(response_body).to include(I18n.t("login.security_key_authenticate")) - expect(response_body).to include(I18n.t("login.security_key_description")) + expect(response.body).to include(I18n.t("login.security_key_authenticate")) + expect(response.body).to include(I18n.t("login.security_key_description")) end context "if the user has a TOTP enabled and wants to use that instead" do @@ -214,21 +198,18 @@ describe UsersEmailController do end it 'allows entering the totp code instead' do - get "/u/confirm-new-email/#{user.email_tokens.last.token}?show_totp=true" + get "/u/confirm-new-email/#{updater.change_req.new_email_token.token}?show_totp=true" expect(response.status).to eq(200) - - response_body = response.body - - expect(response_body).to include(I18n.t("login.second_factor_title")) - expect(response_body).not_to include(I18n.t("login.security_key_authenticate")) + expect(response.body).to include(I18n.t("login.second_factor_title")) + expect(response.body).not_to include(I18n.t("login.security_key_authenticate")) end end it 'adds an error on a security key attempt' do - get "/u/confirm-new-email/#{user.email_tokens.last.token}" + get "/u/confirm-new-email/#{updater.change_req.new_email_token.token}" put "/u/confirm-new-email", params: { - token: user.email_tokens.last.token, + token: updater.change_req.new_email_token.token, second_factor_token: "{}", second_factor_method: UserSecondFactor.methods[:security_key] } @@ -238,26 +219,24 @@ describe UsersEmailController do end it 'confirms with a correct security key token' do - get "/u/confirm-new-email/#{user.email_tokens.last.token}" + get "/u/confirm-new-email/#{updater.change_req.new_email_token.token}" put "/u/confirm-new-email", params: { + token: updater.change_req.new_email_token.token, second_factor_token: valid_security_key_auth_post_data.to_json, - second_factor_method: UserSecondFactor.methods[:security_key], - token: user.email_tokens.last.token + second_factor_method: UserSecondFactor.methods[:security_key] } expect(response.status).to eq(302) - - user.reload - expect(user.email).to eq("new.n.cool@example.com") + expect(user.reload.email).to eq('bubblegum@adventuretime.ooo') end context "if the security key data JSON is garbled" do it "raises an invalid parameters error" do - get "/u/confirm-new-email/#{user.email_tokens.last.token}" + get "/u/confirm-new-email/#{updater.change_req.new_email_token.token}" put "/u/confirm-new-email", params: { + token: updater.change_req.new_email_token.token, second_factor_token: "{someweird: 8notjson}", - second_factor_method: UserSecondFactor.methods[:security_key], - token: user.email_tokens.last.token + second_factor_method: UserSecondFactor.methods[:security_key] } expect(response.status).to eq(400) @@ -268,9 +247,8 @@ describe UsersEmailController do end describe '#confirm-old-email' do - it 'redirects to login for signed out accounts' do - get "/u/confirm-old-email/asdfasdf" + get "/u/confirm-old-email/invalidtoken" expect(response.status).to eq(302) expect(response.redirect_url).to eq("http://test.localhost/login") @@ -279,75 +257,62 @@ describe UsersEmailController do it 'errors out for invalid tokens' do sign_in(user) - get "/u/confirm-old-email/asdfasdf" + get "/u/confirm-old-email/invalidtoken" expect(response.status).to eq(200) expect(response.body).to include(I18n.t('change_email.already_done')) end it 'bans change when accounts do not match' do - sign_in(user) updater = EmailUpdater.new(guardian: moderator.guardian, user: moderator) - updater.change_to('new.n.cool@example.com') + email_change_request = updater.change_to('bubblegum@adventuretime.ooo') - get "/u/confirm-old-email/#{moderator.email_tokens.last.token}" + get "/u/confirm-old-email/#{email_change_request.old_email_token.token}" expect(response.status).to eq(200) expect(body).to include("alert-error") end - context 'valid old address token' do - + context 'valid old token' do it 'confirms with a correct token' do - # NOTE: only moderators need to confirm both old and new sign_in(moderator) updater = EmailUpdater.new(guardian: moderator.guardian, user: moderator) - updater.change_to('new.n.cool@example.com') + email_change_request = updater.change_to('bubblegum@adventuretime.ooo') - get "/u/confirm-old-email/#{moderator.email_tokens.last.token}" + get "/u/confirm-old-email/#{email_change_request.old_email_token.token}" expect(response.status).to eq(200) - body = CGI.unescapeHTML(response.body) - - expect(body) - .to include(I18n.t('change_email.authorizing_old.title')) - - expect(body) - .to include(I18n.t('change_email.authorizing_old.description')) + expect(body).to include(I18n.t('change_email.authorizing_old.title')) + expect(body).to include(I18n.t('change_email.authorizing_old.description')) put "/u/confirm-old-email", params: { - token: moderator.email_tokens.last.token + token: email_change_request.old_email_token.token } expect(response.status).to eq(302) expect(response.redirect_url).to include("done=true") - end end end describe '#create' do - let(:new_email) { 'bubblegum@adventuretime.ooo' } - it 'has an email token' do sign_in(user) - expect { post "/u/#{user.username}/preferences/email.json", params: { email: new_email } } + expect { post "/u/#{user.username}/preferences/email.json", params: { email: 'bubblegum@adventuretime.ooo' } } .to change(EmailChangeRequest, :count) emailChangeRequest = EmailChangeRequest.last expect(emailChangeRequest.old_email).to eq(nil) - expect(emailChangeRequest.new_email).to eq(new_email) + expect(emailChangeRequest.new_email).to eq('bubblegum@adventuretime.ooo') end end describe '#update' do - let(:new_email) { 'bubblegum@adventuretime.ooo' } - it "requires you to be logged in" do - put "/u/#{user.username}/preferences/email.json", params: { email: new_email } + put "/u/#{user.username}/preferences/email.json", params: { email: 'bubblegum@adventuretime.ooo' } expect(response.status).to eq(403) end @@ -368,10 +333,9 @@ describe UsersEmailController do end it "raises an error if you can't edit the user's email" do - Guardian.any_instance.expects(:can_edit_email?).with(user).returns(false) - - put "/u/#{user.username}/preferences/email.json", params: { email: new_email } + SiteSetting.email_editable = false + put "/u/#{user.username}/preferences/email.json", params: { email: 'bubblegum@adventuretime.ooo' } expect(response).to be_forbidden end @@ -384,18 +348,12 @@ describe UsersEmailController do end it 'raises an error' do - put "/u/#{user.username}/preferences/email.json", params: { - email: other_user.email - } - + put "/u/#{user.username}/preferences/email.json", params: { email: other_user.email } expect(response).to_not be_successful end it 'raises an error if there is whitespace too' do - put "/u/#{user.username}/preferences/email.json", params: { - email: "#{other_user.email} " - } - + put "/u/#{user.username}/preferences/email.json", params: { email: "#{other_user.email} " } expect(response).to_not be_successful end end @@ -406,10 +364,7 @@ describe UsersEmailController do end it 'responds with success' do - put "/u/#{user.username}/preferences/email.json", params: { - email: other_user.email - } - + put "/u/#{user.username}/preferences/email.json", params: { email: other_user.email } expect(response.status).to eq(200) end end @@ -419,10 +374,7 @@ describe UsersEmailController do fab!(:other_user) { Fabricate(:user, email: 'case.insensitive@gmail.com') } it 'raises an error' do - put "/u/#{user.username}/preferences/email.json", params: { - email: other_user.email.upcase - } - + put "/u/#{user.username}/preferences/email.json", params: { email: other_user.email.upcase } expect(response).to_not be_successful end end @@ -430,34 +382,24 @@ describe UsersEmailController do it 'raises an error when new email domain is present in blocked_email_domains site setting' do SiteSetting.blocked_email_domains = "mailinator.com" - put "/u/#{user.username}/preferences/email.json", params: { - email: "not_good@mailinator.com" - } - + put "/u/#{user.username}/preferences/email.json", params: { email: "not_good@mailinator.com" } expect(response).to_not be_successful end it 'raises an error when new email domain is not present in allowed_email_domains site setting' do SiteSetting.allowed_email_domains = "discourse.org" - put "/u/#{user.username}/preferences/email.json", params: { - email: new_email - } - + put "/u/#{user.username}/preferences/email.json", params: { email: 'bubblegum@adventuretime.ooo' } expect(response).to_not be_successful end context 'success' do it 'has an email token' do expect do - put "/u/#{user.username}/preferences/email.json", params: { - email: new_email - } + put "/u/#{user.username}/preferences/email.json", params: { email: 'bubblegum@adventuretime.ooo' } end.to change(EmailChangeRequest, :count) end end end - end - end diff --git a/spec/services/user_activator_spec.rb b/spec/services/user_activator_spec.rb index adf3191bab..11e1775da5 100644 --- a/spec/services/user_activator_spec.rb +++ b/spec/services/user_activator_spec.rb @@ -3,42 +3,21 @@ require 'rails_helper' describe UserActivator do + fab!(:user) { Fabricate(:user) } + let!(:email_token) { Fabricate(:email_token, user: user) } describe 'email_activator' do + let(:activator) { EmailActivator.new(user, nil, nil, nil) } - it 'does not create new email token unless required' do - SiteSetting.email_token_valid_hours = 24 - user = Fabricate(:user) - activator = EmailActivator.new(user, nil, nil, nil) - - expect_enqueued_with(job: :critical_user_email, args: { type: :signup, email_token: user.email_tokens.first.token }) do - activator.activate - end - end - - it 'creates and send new email token if the existing token expired' do + it 'create email token and enqueues user email' do now = freeze_time - - SiteSetting.email_token_valid_hours = 24 - user = Fabricate(:user) - email_token = user.email_tokens.first - email_token.update_column(:created_at, 48.hours.ago) - activator = EmailActivator.new(user, nil, nil, nil) - - expect_not_enqueued_with(job: :critical_user_email, args: { type: :signup, user_id: user.id, email_token: email_token.token }) do - activator.activate - end - + activator.activate email_token = user.reload.email_tokens.last - - expect(job_enqueued?(job: :critical_user_email, args: { - type: :signup, - user_id: user.id, - email_token: email_token.token - })).to eq(true) - expect(email_token.created_at).to eq_time(now) + job_args = Jobs::CriticalUserEmail.jobs.last["args"].first + expect(job_args["user_id"]).to eq(user.id) + expect(job_args["type"]).to eq("signup") + expect(EmailToken.hash_token(job_args["email_token"])).to eq(email_token.token_hash) end - end end From 6e2d4a14acbbfed14c833254893a8bb27fd3eec4 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Thu, 25 Nov 2021 10:34:30 +0200 Subject: [PATCH 097/168] FIX: Delete unconfirmed AND expired email tokens only (#15089) --- app/jobs/scheduled/clean_up_email_tokens.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/scheduled/clean_up_email_tokens.rb b/app/jobs/scheduled/clean_up_email_tokens.rb index 006c5dbf02..0781115fd8 100644 --- a/app/jobs/scheduled/clean_up_email_tokens.rb +++ b/app/jobs/scheduled/clean_up_email_tokens.rb @@ -6,7 +6,7 @@ module Jobs def execute(args) EmailToken - .where('NOT confirmed OR expired') + .where('NOT confirmed AND expired') .where('created_at < ?', 1.month.ago) .delete_all end From fd93d6f955302907aa5e6ee96ff24e038464f04a Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 25 Nov 2021 12:07:07 +0000 Subject: [PATCH 098/168] DEV: `lib/user-presence` improvements (#15046) - Remove JQuery - Remove legacy `document.webkitHidden` support. None of our currently supported browsers need this - Use `passive` event listeners. These allows the browser to process the events first, before passing control to us - Add a new `unseenTime` parameter. This allows consumers to request a delay before being notified about the browser going into the background - Add a method for removing a callback - Fire the callback when presence changes in either direction. Previously it would only fire when the user becomes present after a period of inactivity. - Ensure callbacks are only called once for each state change. Previously they would be called every 60s, regardless of the value - Listen to the `visibilitychanged` and `focus` events, treating them as equivalent to user action. This will make messagebus re-activate more quickly when switching back to a stale tab - Add test helpers - Delete the unused `discourse/lib/page-visible` module. - Call message-bus's onVisibilityChange API directly, rather than dispatching a fake event on the `document` --- .../discourse/app/initializers/message-bus.js | 8 +- .../discourse/app/lib/page-visible.js | 15 -- .../discourse/app/lib/user-presence.js | 182 ++++++++++++------ .../discourse/tests/helpers/qunit-helpers.js | 8 + 4 files changed, 140 insertions(+), 73 deletions(-) delete mode 100644 app/assets/javascripts/discourse/app/lib/page-visible.js diff --git a/app/assets/javascripts/discourse/app/initializers/message-bus.js b/app/assets/javascripts/discourse/app/initializers/message-bus.js index b7964f6a9f..fff5732c97 100644 --- a/app/assets/javascripts/discourse/app/initializers/message-bus.js +++ b/app/assets/javascripts/discourse/app/initializers/message-bus.js @@ -46,7 +46,7 @@ export default { messageBus.alwaysLongPoll = !isProduction(); messageBus.shouldLongPollCallback = () => - userPresent(LONG_POLL_AFTER_UNSEEN_TIME); + userPresent({ userUnseenTime: LONG_POLL_AFTER_UNSEEN_TIME }); // we do not want to start anything till document is complete messageBus.stop(); @@ -56,7 +56,11 @@ export default { // When 20 minutes pass we stop long polling due to "shouldLongPollCallback". onPresenceChange({ unseenTime: LONG_POLL_AFTER_UNSEEN_TIME, - callback: () => document.dispatchEvent(new Event("visibilitychange")), + callback: (present) => { + if (present && messageBus.onVisibilityChange) { + messageBus.onVisibilityChange(); + } + }, }); if (siteSettings.login_required && !user) { diff --git a/app/assets/javascripts/discourse/app/lib/page-visible.js b/app/assets/javascripts/discourse/app/lib/page-visible.js deleted file mode 100644 index 0771a2f3c0..0000000000 --- a/app/assets/javascripts/discourse/app/lib/page-visible.js +++ /dev/null @@ -1,15 +0,0 @@ -// for android we test webkit -let hiddenProperty = - document.hidden !== undefined - ? "hidden" - : document.webkitHidden !== undefined - ? "webkitHidden" - : undefined; - -export default function () { - if (hiddenProperty !== undefined) { - return !document[hiddenProperty]; - } else { - return document && document.hasFocus; - } -} diff --git a/app/assets/javascripts/discourse/app/lib/user-presence.js b/app/assets/javascripts/discourse/app/lib/user-presence.js index 92f17111e8..7fe1af6c6c 100644 --- a/app/assets/javascripts/discourse/app/lib/user-presence.js +++ b/app/assets/javascripts/discourse/app/lib/user-presence.js @@ -1,68 +1,138 @@ -// for android we test webkit -const hiddenProperty = - document.hidden !== undefined - ? "hidden" - : document.webkitHidden !== undefined - ? "webkitHidden" - : undefined; - -const MAX_UNSEEN_TIME = 60000; - -let seenUserTime = Date.now(); - -export default function (maxUnseenTime) { - maxUnseenTime = maxUnseenTime === undefined ? MAX_UNSEEN_TIME : maxUnseenTime; - const now = Date.now(); - - if (seenUserTime + maxUnseenTime < now) { - return false; - } - - if (hiddenProperty !== undefined) { - return !document[hiddenProperty]; - } else { - return document && document.hasFocus; - } -} +import { isTesting } from "discourse-common/config/environment"; const callbacks = []; -const MIN_DELTA = 60000; +const DEFAULT_USER_UNSEEN_MS = 60000; +const DEFAULT_BROWSER_HIDDEN_MS = 0; + +let browserHiddenAt = null; +let lastUserActivity = Date.now(); +let userSeenJustNow = false; + +let callbackWaitingForPresence = false; + +let testPresence = true; + +// Check whether the document is currently visible, and the user is actively using the site +// Will return false if the browser went into the background more than `browserHiddenTime` milliseconds ago +// Will also return false if there has been no user activty for more than `userUnseenTime` milliseconds +// Otherwise, will return true +export default function userPresent({ + browserHiddenTime = DEFAULT_BROWSER_HIDDEN_MS, + userUnseenTime = DEFAULT_USER_UNSEEN_MS, +} = {}) { + if (isTesting()) { + return testPresence; + } + + if (browserHiddenAt) { + const timeSinceBrowserHidden = Date.now() - browserHiddenAt; + if (timeSinceBrowserHidden >= browserHiddenTime) { + return false; + } + } + + const timeSinceUserActivity = Date.now() - lastUserActivity; + if (timeSinceUserActivity >= userUnseenTime) { + return false; + } + + return true; +} + +// Register a callback to be triggered when the value of `userPresent()` changes. +// userUnseenTime and browserHiddenTime work the same as for `userPresent()` +// 'not present' callbacks may lag by up to 10s, depending on the reason +// 'now present' callbacks should be almost instantaneous +export function onPresenceChange({ + userUnseenTime = DEFAULT_USER_UNSEEN_MS, + browserHiddenTime = DEFAULT_BROWSER_HIDDEN_MS, + callback, +} = {}) { + if (userUnseenTime < DEFAULT_USER_UNSEEN_MS) { + throw `userUnseenTime must be at least ${DEFAULT_USER_UNSEEN_MS}`; + } + callbacks.push({ + userUnseenTime, + browserHiddenTime, + lastState: true, + callback, + }); +} + +export function removeOnPresenceChange(callback) { + const i = callbacks.findIndex((c) => c.callback === callback); + callbacks.splice(i, 1); +} + +function processChanges() { + const browserHidden = document.hidden; + if (!!browserHiddenAt !== browserHidden) { + browserHiddenAt = browserHidden ? Date.now() : null; + } + + if (userSeenJustNow) { + lastUserActivity = Date.now(); + userSeenJustNow = false; + } + + callbackWaitingForPresence = false; + for (const callback of callbacks) { + const currentState = userPresent({ + userUnseenTime: callback.userUnseenTime, + browserHiddenTime: callback.browserHiddenTime, + }); + + if (callback.lastState !== currentState) { + try { + callback.callback(currentState); + } finally { + callback.lastState = currentState; + } + } + + if (!currentState) { + callbackWaitingForPresence = true; + } + } +} export function seenUser() { - let lastSeenTime = seenUserTime; - seenUserTime = Date.now(); - let delta = seenUserTime - lastSeenTime; - - if (lastSeenTime && delta > MIN_DELTA) { - callbacks.forEach((info) => { - if (delta > info.unseenTime) { - info.callback(); - } - }); + userSeenJustNow = true; + if (callbackWaitingForPresence) { + processChanges(); } } -// register a callback for cases where presence changed -export function onPresenceChange({ unseenTime, callback }) { - if (unseenTime < MIN_DELTA) { - throw "unseenTime is too short"; +export function visibilityChanged() { + if (document.hidden) { + processChanges(); + } else { + seenUser(); } - callbacks.push({ unseenTime, callback }); } -// We could piggieback on the Scroll mixin, but it is not applied -// consistently to all pages -// -// We try to keep this as cheap as possible by performing absolute minimal -// amount of work when the event handler is fired -// -// An alternative would be to use a timer that looks at the scroll position -// however this will not work as message bus can issue page updates and scroll -// page around when user is not present -// -// We avoid tracking mouse move which would be very expensive +export function setTestPresence(value) { + if (!isTesting()) { + throw "Only available in test mode"; + } + testPresence = value; +} -$(document).bind("touchmove.discourse-track-presence", seenUser); -$(document).bind("click.discourse-track-presence", seenUser); -$(window).bind("scroll.discourse-track-presence", seenUser); +export function clearPresenceCallbacks() { + callbacks.splice(0, callbacks.length); +} + +if (!isTesting()) { + // Some of these events occur very frequently. Therefore seenUser() is as fast as possible. + document.addEventListener("touchmove", seenUser, { passive: true }); + document.addEventListener("click", seenUser, { passive: true }); + window.addEventListener("scroll", seenUser, { passive: true }); + window.addEventListener("focus", seenUser, { passive: true }); + + document.addEventListener("visibilitychange", visibilityChanged, { + passive: true, + }); + + setInterval(processChanges, 10000); +} diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js index 84e9aa5aa0..956deeb0de 100644 --- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js +++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js @@ -54,6 +54,10 @@ import { resetLastEditNotificationClick } from "discourse/models/post-stream"; import { clearAuthMethods } from "discourse/models/login-method"; import { clearTopicFooterDropdowns } from "discourse/lib/register-topic-footer-dropdown"; import { clearTopicFooterButtons } from "discourse/lib/register-topic-footer-button"; +import { + clearPresenceCallbacks, + setTestPresence, +} from "discourse/lib/user-presence"; const LEGACY_ENV = !setupApplicationTest; @@ -297,6 +301,10 @@ export function acceptance(name, optionsOrCallback) { clearTopicFooterButtons(); resetLastEditNotificationClick(); clearAuthMethods(); + setTestPresence(true); + if (!LEGACY_ENV) { + clearPresenceCallbacks(); + } app._runInitializer("instanceInitializers", (_, initializer) => { initializer.teardown?.(); From 03998e0a299b7ae89678e2854e3abf84bd6ef132 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 25 Nov 2021 12:07:34 +0000 Subject: [PATCH 099/168] FIX: Use CDN URL for internal onebox avatars (#15077) This commit will also trigger a background rebake for all existing posts with internal oneboxes --- app/services/username_changer.rb | 2 +- ...11124161346_queue_internal_onebox_rebake.rb | 18 ++++++++++++++++++ lib/oneboxer.rb | 2 +- spec/components/oneboxer_spec.rb | 6 +++--- spec/services/username_changer_spec.rb | 4 ++-- 5 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 db/post_migrate/20211124161346_queue_internal_onebox_rebake.rb diff --git a/app/services/username_changer.rb b/app/services/username_changer.rb index 7c6cec61cc..0c8c472805 100644 --- a/app/services/username_changer.rb +++ b/app/services/username_changer.rb @@ -24,7 +24,7 @@ class UsernameChanger UsernameChanger.update_username(user_id: @user.id, old_username: @old_username, new_username: @new_username, - avatar_template: @user.avatar_template, + avatar_template: @user.avatar_template_url, asynchronous: asynchronous) if run_update_job return true end diff --git a/db/post_migrate/20211124161346_queue_internal_onebox_rebake.rb b/db/post_migrate/20211124161346_queue_internal_onebox_rebake.rb new file mode 100644 index 0000000000..85af7f1cee --- /dev/null +++ b/db/post_migrate/20211124161346_queue_internal_onebox_rebake.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class QueueInternalOneboxRebake < ActiveRecord::Migration[6.1] + def up + # Prior to this fix, internal oneboxes were bypassing the CDN for avatar URLs. + # If a site has a CDN, queue up a rebake in the background + if GlobalSetting.cdn_url + execute <<~SQL + UPDATE posts SET baked_version = 0 + WHERE cooked LIKE '%src="/user_avatar/%' + SQL + end + end + + def down + # Do nothing + end +end diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb index 6c194fb041..61393627af 100644 --- a/lib/oneboxer.rb +++ b/lib/oneboxer.rb @@ -321,7 +321,7 @@ module Oneboxer args = { topic_id: topic.id, post_number: post.post_number, - avatar: PrettyText.avatar_img(post.user.avatar_template, "tiny"), + avatar: PrettyText.avatar_img(post.user.avatar_template_url, "tiny"), original_url: url, title: PrettyText.unescape_emoji(CGI::escapeHTML(topic.title)), category_html: CategoryBadge.html_for(topic.category), diff --git a/spec/components/oneboxer_spec.rb b/spec/components/oneboxer_spec.rb index 21afb3abc9..8e68bf7ae8 100644 --- a/spec/components/oneboxer_spec.rb +++ b/spec/components/oneboxer_spec.rb @@ -72,7 +72,7 @@ describe Oneboxer do onebox = preview(public_reply.url, user, public_category) expect(onebox).to include(public_reply.excerpt) expect(onebox).to include(%{data-post="2"}) - expect(onebox).to include(PrettyText.avatar_img(replier.avatar_template, "tiny")) + expect(onebox).to include(PrettyText.avatar_img(replier.avatar_template_url, "tiny")) short_url = "#{Discourse.base_path}/t/#{public_topic.id}" expect(preview(short_url, user, public_category)).to include(public_topic.title) @@ -80,11 +80,11 @@ describe Oneboxer do onebox = preview(public_moderator_action.url, user, public_category) expect(onebox).to include(public_moderator_action.excerpt) expect(onebox).to include(%{data-post="4"}) - expect(onebox).to include(PrettyText.avatar_img(staff.avatar_template, "tiny")) + expect(onebox).to include(PrettyText.avatar_img(staff.avatar_template_url, "tiny")) onebox = preview(public_reply.url, user, public_category, public_topic) expect(onebox).not_to include(public_topic.title) - expect(onebox).to include(replier.avatar_template.sub("{size}", "40")) + expect(onebox).to include(replier.avatar_template_url.sub("{size}", "40")) expect(preview(public_hidden.url, user, public_category)).to match_html(link(public_hidden.url)) expect(preview(secured_topic.relative_url, user, public_category)).to match_html(link(secured_topic.relative_url)) diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb index 3b56863f53..c0d935e9c8 100644 --- a/spec/services/username_changer_spec.rb +++ b/spec/services/username_changer_spec.rb @@ -323,7 +323,7 @@ describe UsernameChanger do context 'quotes' do let(:quoted_post) { create_post(user: user, topic: topic, post_number: 1, raw: "quoted post") } - let(:avatar_url) { user.avatar_template.gsub("{size}", "40") } + let(:avatar_url) { user.avatar_template_url.gsub("{size}", "40") } it 'replaces the username in quote tags and updates avatar' do post = create_post_and_change_username(raw: <<~RAW) @@ -448,7 +448,7 @@ describe UsernameChanger do end def user_avatar_url(u) - u.avatar_template.gsub("{size}", "40") + u.avatar_template_url.gsub("{size}", "40") end it 'updates avatar for linked topics and posts' do From b1844c45c3896f8c493687ad5bf6f6865afdc414 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Thu, 25 Nov 2021 16:28:28 +0200 Subject: [PATCH 100/168] DEV: Stop if theme:update fails for default site (#15090) The error handling of the theme:update Rake task has been improved. If an error occurs while updating the default site, then the exception will be propagated and the process will exit with non-zero status. This is a follow-up to commit 3f97f884fef9d3e4b33ae6361d7891c3c414802b. --- lib/tasks/themes.rake | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake index ddc3abb4e3..5dbcae6367 100644 --- a/lib/tasks/themes.rake +++ b/lib/tasks/themes.rake @@ -52,24 +52,23 @@ task "themes:install" => :environment do |task, args| end end -def update_themes(fail_stop: true) +def update_themes Theme.includes(:remote_theme).where(enabled: true, auto_update: true).find_each do |theme| begin - next if theme.remote_theme.blank? + remote_theme = theme.remote_theme + next if remote_theme.blank? puts "Updating '#{theme.name}' for '#{RailsMultisite::ConnectionManagement.current_db}'..." - theme.remote_theme.update_from_remote + remote_theme.update_from_remote - if theme.remote_theme.last_error_text.present? - puts "Error updating '#{theme.name}': #{theme.remote_theme.last_error_text}" - exit 1 if fail_stop - end + raise RemoteTheme::ImportError.new(remote_theme.last_error_text) if remote_theme.last_error_text.present? rescue => e STDERR.puts "Failed to update '#{theme.name}': #{e}" - STDERR.puts e.backtrace - exit 1 if fail_stop + raise if RailsMultisite::ConnectionManagement.current_db == "default" end end + + true end desc "Update themes & theme components" @@ -78,7 +77,7 @@ task "themes:update" => :environment do update_themes else RailsMultisite::ConnectionManagement.each_connection do - update_themes(fail_stop: false) + update_themes end end end From cabacb5c48090ba12b307503b0d873fe4ffbaace Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 25 Nov 2021 16:56:11 +0100 Subject: [PATCH 101/168] DEV: Drop non-visualViewport Safari hacks (#15007) Those were required pre-iOS 13. --- .../discourse/app/components/emoji-picker.js | 7 +- .../app/controllers/preferences/interface.js | 29 +------ .../discourse/app/lib/safari-hacks.js | 87 +------------------ .../discourse/app/lib/utilities.js | 22 ++--- .../app/mixins/textarea-text-manipulation.js | 3 +- .../app/templates/preferences/interface.hbs | 3 - 6 files changed, 16 insertions(+), 135 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker.js b/app/assets/javascripts/discourse/app/components/emoji-picker.js index 2018919644..3d04b226bb 100644 --- a/app/assets/javascripts/discourse/app/components/emoji-picker.js +++ b/app/assets/javascripts/discourse/app/components/emoji-picker.js @@ -6,7 +6,7 @@ import { isSkinTonableEmoji, } from "pretty-text/emoji"; import { emojiUnescape, emojiUrlFor } from "discourse/lib/text"; -import { escapeExpression, safariHacksDisabled } from "discourse/lib/utilities"; +import { escapeExpression } from "discourse/lib/utilities"; import { later, schedule } from "@ember/runloop"; import Component from "@ember/component"; import { createPopper } from "@popperjs/core"; @@ -115,10 +115,7 @@ export default Component.extend({ this.set("isLoading", false); schedule("afterRender", () => { - if ( - (!this.site.isMobileDevice || this.isEditorFocused) && - !safariHacksDisabled() - ) { + if (!this.site.isMobileDevice || this.isEditorFocused) { const filter = emojiPicker.querySelector("input.filter"); filter && filter.focus(); diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js index 8a769cee58..d91dde1b52 100644 --- a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js +++ b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js @@ -1,11 +1,6 @@ import Controller, { inject as controller } from "@ember/controller"; import Session from "discourse/models/session"; -import { - iOSWithVisualViewport, - isiPad, - safariHacksDisabled, - setDefaultHomepage, -} from "discourse/lib/utilities"; +import { setDefaultHomepage } from "discourse/lib/utilities"; import { listColorSchemes, loadColorSchemeStylesheet, @@ -72,18 +67,6 @@ export default Controller.extend({ return attrs; }, - @discourseComputed() - isiPad() { - // TODO: remove this preference checkbox when iOS adoption > 90% - // (currently only applies to iOS 12 and below) - return isiPad() && !iOSWithVisualViewport(); - }, - - @discourseComputed() - disableSafariHacks() { - return safariHacksDisabled(); - }, - @discourseComputed() availableLocales() { return JSON.parse(this.siteSettings.available_locales); @@ -342,16 +325,6 @@ export default Controller.extend({ this.homeChanged(); - if (this.isiPad) { - if (safariHacksDisabled() !== this.disableSafariHacks) { - this.session.requiresRefresh = true; - } - localStorage.setItem( - "safari-hacks-disabled", - this.disableSafariHacks.toString() - ); - } - if (this.themeId !== this.currentThemeId) { reload(); } diff --git a/app/assets/javascripts/discourse/app/lib/safari-hacks.js b/app/assets/javascripts/discourse/app/lib/safari-hacks.js index 3f6c17fe15..5d9f8f0e5b 100644 --- a/app/assets/javascripts/discourse/app/lib/safari-hacks.js +++ b/app/assets/javascripts/discourse/app/lib/safari-hacks.js @@ -1,76 +1,8 @@ -import { - iOSWithVisualViewport, - safariHacksDisabled, -} from "discourse/lib/utilities"; import { INPUT_DELAY } from "discourse-common/config/environment"; import discourseDebounce from "discourse-common/lib/debounce"; import { helperContext } from "discourse-common/lib/helpers"; import { later } from "@ember/runloop"; -// TODO: remove calcHeight once iOS 13 adoption > 90% -// In iOS 13 and up we use visualViewport API to calculate height - -// we can't tell what the actual visible window height is -// because we cannot account for the height of the mobile keyboard -// and any other mobile autocomplete UI that may appear -// so let's be conservative here rather than trying to max out every -// available pixel of height for the editor -function calcHeight() { - // estimate 270 px for keyboard - let withoutKeyboard = window.innerHeight - 270; - const min = 270; - - // iPhone shrinks header and removes footer controls ( back / forward nav ) - // at 39px we are at the largest viewport - const portrait = window.innerHeight > window.innerWidth; - const smallViewport = - (portrait ? window.screen.height : window.screen.width) - - window.innerHeight > - 40; - - if (portrait) { - // iPhone SE, it is super small so just - // have a bit of crop - if (window.screen.height === 568) { - withoutKeyboard = 270; - } - - // iPhone 6/7/8 - if (window.screen.height === 667) { - withoutKeyboard = smallViewport ? 295 : 325; - } - - // iPhone 6/7/8 plus - if (window.screen.height === 736) { - withoutKeyboard = smallViewport ? 353 : 383; - } - - // iPhone X - if (window.screen.height === 812) { - withoutKeyboard = smallViewport ? 340 : 370; - } - - // iPhone Xs Max and iPhone Xʀ - if (window.screen.height === 896) { - withoutKeyboard = smallViewport ? 410 : 440; - } - - // iPad can use innerHeight cause it renders nothing in the footer - if (window.innerHeight > 920) { - withoutKeyboard -= 45; - } - } else { - // landscape - // iPad, we have a bigger keyboard - if (window.innerHeight > 665) { - withoutKeyboard -= 128; - } - } - - // iPad portrait also has a bigger keyboard - return Math.max(withoutKeyboard, min); -} - let workaroundActive = false; export function isWorkaroundActive() { @@ -80,7 +12,7 @@ export function isWorkaroundActive() { // per http://stackoverflow.com/questions/29001977/safari-in-ios8-is-scrolling-screen-when-fixed-elements-get-focus/29064810 function positioningWorkaround($fixedElement) { let caps = helperContext().capabilities; - if (!caps.isIOS || safariHacksDisabled()) { + if (!caps.isIOS) { return; } @@ -91,8 +23,6 @@ function positioningWorkaround($fixedElement) { }); const fixedElement = $fixedElement[0]; - const oldHeight = fixedElement.style.height; - let originalScrollTop = 0; let lastTouchedElement = null; @@ -106,11 +36,6 @@ function positioningWorkaround($fixedElement) { } workaroundActive = false; - - if (!iOSWithVisualViewport()) { - fixedElement.style.height = oldHeight; - later(() => $(fixedElement).removeClass("no-transition"), 500); - } } }; @@ -172,8 +97,8 @@ function positioningWorkaround($fixedElement) { let delay = caps.isIpadOS ? 350 : 150; - later(function () { - if (caps.isIpadOS && iOSWithVisualViewport()) { + later(() => { + if (caps.isIpadOS) { // disable hacks when using a hardware keyboard // by default, a hardware keyboard will show the keyboard accessory bar // whose height is currently 55px (using 75 for a bit of a buffer) @@ -191,12 +116,6 @@ function positioningWorkaround($fixedElement) { document.body.classList.add("ios-safari-composer-hacks"); window.scrollTo(0, 0); - if (!iOSWithVisualViewport()) { - const height = calcHeight(); - fixedElement.style.height = height + "px"; - $(fixedElement).addClass("no-transition"); - } - evt.preventDefault(); _this.focus(); workaroundActive = true; diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js index acdc69825e..c6a5ca1446 100644 --- a/app/assets/javascripts/discourse/app/lib/utilities.js +++ b/app/assets/javascripts/discourse/app/lib/utilities.js @@ -5,6 +5,7 @@ import { deepMerge } from "discourse-common/lib/object"; import { escape } from "pretty-text/sanitizer"; import { helperContext } from "discourse-common/lib/helpers"; import toMarkdown from "discourse/lib/to-markdown"; +import deprecated from "discourse-common/lib/deprecated"; let _defaultHomepage; @@ -306,10 +307,6 @@ export function isAppleDevice() { let iPadDetected = undefined; -export function iOSWithVisualViewport() { - return isAppleDevice() && window.visualViewport !== undefined; -} - export function isiPad() { if (iPadDetected === undefined) { iPadDetected = @@ -320,16 +317,15 @@ export function isiPad() { } export function safariHacksDisabled() { - if (iOSWithVisualViewport()) { - return false; - } + deprecated( + "`safariHacksDisabled()` is deprecated, it now always returns `false`", + { + since: "2.8.0.beta8", + dropFrom: "2.9.0.beta1", + } + ); - let pref = localStorage.getItem("safari-hacks-disabled"); - let result = false; - if (pref !== null) { - result = pref === "true"; - } - return result; + return false; } const toArray = (items) => { diff --git a/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js b/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js index aab066c61b..6dd67f74ad 100644 --- a/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js +++ b/app/assets/javascripts/discourse/app/mixins/textarea-text-manipulation.js @@ -8,7 +8,6 @@ import { isTesting } from "discourse-common/config/environment"; import { clipboardHelpers, determinePostReplaceSelection, - safariHacksDisabled, } from "discourse/lib/utilities"; import { next, schedule } from "@ember/runloop"; @@ -96,7 +95,7 @@ export default Mixin.create({ this._$textarea.trigger("change"); if (opts.scroll) { const oldScrollPos = this._$textarea.scrollTop(); - if (!this.capabilities.isIOS || safariHacksDisabled()) { + if (!this.capabilities.isIOS) { this._$textarea.focus(); } this._$textarea.scrollTop(oldScrollPos); diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs index 4c07cafbdb..ebe30a1ec5 100644 --- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs +++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs @@ -142,9 +142,6 @@ {{#if siteSettings.allow_users_to_hide_profile}} {{preference-checkbox labelKey="user.hide_profile_and_presence" checked=model.user_option.hide_profile_and_presence class="pref-hide-profile"}} {{/if}} - {{#if isiPad}} - {{preference-checkbox labelKey="user.enable_physical_keyboard" checked=disableSafariHacks class="pref-safari-hacks"}} - {{/if}} {{preference-checkbox labelKey="user.dynamic_favicon" checked=model.user_option.dynamic_favicon class="pref-dynamic-favicon"}}
From 1166afa4e867a7f397c9c3f8e46b6d02f2aecb4a Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Thu, 25 Nov 2021 11:16:55 -0500 Subject: [PATCH 102/168] FIX: Software update prompt position on themes with extra header (#15094) --- .../javascripts/discourse/app/components/site-header.js | 3 +-- .../discourse/tests/acceptance/sticky-avatars-test.js | 4 ++-- app/assets/stylesheets/common/software-update-prompt.scss | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js index 3d65573877..6be70db36f 100644 --- a/app/assets/javascripts/discourse/app/components/site-header.js +++ b/app/assets/javascripts/discourse/app/components/site-header.js @@ -186,18 +186,17 @@ const SiteHeaderComponent = MountWidget.extend( const headerRect = header.getBoundingClientRect(), headerOffset = headerRect.top + headerRect.height, doc = document.documentElement; + doc.style.setProperty("--header-offset", `${headerOffset}px`); if (offset >= this.docAt) { if (!this.dockedHeader) { document.body.classList.add("docked"); this.dockedHeader = true; - doc.style.setProperty("--header-offset", `${headerOffset}px`); } } else { if (this.dockedHeader) { document.body.classList.remove("docked"); this.dockedHeader = false; } - doc.style.setProperty("--header-offset", `${headerOffset}px`); } }, diff --git a/app/assets/javascripts/discourse/tests/acceptance/sticky-avatars-test.js b/app/assets/javascripts/discourse/tests/acceptance/sticky-avatars-test.js index 9fed8842c3..e4542dc8bb 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sticky-avatars-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sticky-avatars-test.js @@ -1,5 +1,5 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers"; -import { test } from "qunit"; +import { skip } from "qunit"; import { find, scrollTo, visit, waitUntil } from "@ember/test-helpers"; import { setupApplicationTest as EMBER_CLI_ENV } from "ember-qunit"; @@ -14,7 +14,7 @@ acceptance("Sticky Avatars", function (needs) { container.scrollTop = 0; }); - test("Adds sticky avatars when scrolling up", async function (assert) { + skip("Adds sticky avatars when scrolling up", async function (assert) { await visit("/t/internationalization-localization/280"); await scrollTo(container, 0, 800); diff --git a/app/assets/stylesheets/common/software-update-prompt.scss b/app/assets/stylesheets/common/software-update-prompt.scss index d2fbdbe91f..c253eaad48 100644 --- a/app/assets/stylesheets/common/software-update-prompt.scss +++ b/app/assets/stylesheets/common/software-update-prompt.scss @@ -3,6 +3,7 @@ flex: 1; right: 0; left: 0; + top: var(--header-offset, 60px); background-color: var(--tertiary-low); color: var(--tertiary); max-height: 0; From 5647819de40bd7900bc4e9556ef3a673075dab4d Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Thu, 25 Nov 2021 16:58:39 -0300 Subject: [PATCH 103/168] FEATURE: Send a 'noindex' header in non-canonical responses (#15026) * FEATURE: Optionally send a 'noindex' header in non-canonical responses This will be used in a SEO experiment. Co-authored-by: David Taylor --- app/controllers/application_controller.rb | 10 +++++++- config/site_settings.yml | 3 +++ lib/canonical_url.rb | 27 ++++++++++++-------- spec/requests/application_controller_spec.rb | 27 ++++++++++++++++++++ spec/requests/groups_controller_spec.rb | 6 ----- 5 files changed, 56 insertions(+), 17 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0561be4c82..8d1494136e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -41,13 +41,14 @@ class ApplicationController < ActionController::Base before_action :redirect_to_login_if_required before_action :block_if_requires_login before_action :preload_json - before_action :add_noindex_header, if: -> { is_feed_request? || !SiteSetting.allow_index_in_robots_txt } before_action :check_xhr after_action :add_readonly_header after_action :perform_refresh_session after_action :dont_cache_page after_action :conditionally_allow_site_embedding after_action :ensure_vary_header + after_action :add_noindex_header, if: -> { is_feed_request? || !SiteSetting.allow_index_in_robots_txt } + after_action :add_noindex_header_to_non_canonical, if: -> { request.get? && !(request.format && request.format.json?) && !request.xhr? } HONEYPOT_KEY ||= 'HONEYPOT_KEY' CHALLENGE_KEY ||= 'CHALLENGE_KEY' @@ -912,6 +913,13 @@ class ApplicationController < ActionController::Base end end + def add_noindex_header_to_non_canonical + canonical = (@canonical_url || @default_canonical) + if canonical.present? && canonical != request.url && !SiteSetting.allow_indexing_non_canonical_urls + response.headers['X-Robots-Tag'] ||= 'noindex' + end + end + protected def honeypot_value diff --git a/config/site_settings.yml b/config/site_settings.yml index 508981517d..d82c83144a 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1602,6 +1602,9 @@ security: regex: "^(Lax|Strict|Disabled|None)$" enable_escaped_fragments: true allow_index_in_robots_txt: true + allow_indexing_non_canonical_urls: + default: true + hidden: true moderators_manage_categories_and_groups: false moderators_change_post_ownership: client: true diff --git a/lib/canonical_url.rb b/lib/canonical_url.rb index d318bd56de..df66c37a6c 100644 --- a/lib/canonical_url.rb +++ b/lib/canonical_url.rb @@ -2,6 +2,8 @@ module CanonicalURL module ControllerExtensions + ALLOWED_CANONICAL_PARAMS = %w(page) + def canonical_url(url_for_options = {}) case url_for_options when Hash @@ -10,22 +12,27 @@ module CanonicalURL @canonical_url = url_for_options end end + + def default_canonical + @default_canonical ||= begin + canonical = +"#{Discourse.base_url_no_prefix}#{request.path}" + allowed_params = params.select { |key| ALLOWED_CANONICAL_PARAMS.include?(key) } + if allowed_params.present? + canonical << "?#{allowed_params.keys.zip(allowed_params.values).map { |key, value| "#{key}=#{value}" }.join("&")}" + end + canonical + end + end + + def self.included(base) + base.helper_method :default_canonical + end end module Helpers - ALLOWED_CANONICAL_PARAMS = %w(page) def canonical_link_tag(url = nil) tag('link', rel: 'canonical', href: url || @canonical_url || default_canonical) end - - def default_canonical - canonical = +"#{Discourse.base_url_no_prefix}#{request.path}" - allowed_params = params.select { |key| ALLOWED_CANONICAL_PARAMS.include?(key) } - if allowed_params.present? - canonical << "?#{allowed_params.keys.zip(allowed_params.values).map { |key, value| "#{key}=#{value}" }.join("&")}" - end - canonical - end end end diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb index 603d2f3fa0..34d9ecb07f 100644 --- a/spec/requests/application_controller_spec.rb +++ b/spec/requests/application_controller_spec.rb @@ -668,6 +668,33 @@ RSpec.describe ApplicationController do expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/t/#{topic.slug}/#{topic.id}" }) end + it "adds a noindex header if non-canonical indexing is disabled" do + SiteSetting.allow_indexing_non_canonical_urls = false + get '/' + expect(response.headers['X-Robots-Tag']).to be_nil + + get '/latest' + expect(response.headers['X-Robots-Tag']).to be_nil + + get '/categories' + expect(response.headers['X-Robots-Tag']).to be_nil + + topic = create_post.topic + get "/t/#{topic.slug}/#{topic.id}" + expect(response.headers['X-Robots-Tag']).to be_nil + post = create_post(topic_id: topic.id) + get "/t/#{topic.slug}/#{topic.id}/2" + expect(response.headers['X-Robots-Tag']).to eq('noindex') + + 20.times do + create_post(topic_id: topic.id) + end + get "/t/#{topic.slug}/#{topic.id}/21" + expect(response.headers['X-Robots-Tag']).to eq('noindex') + get "/t/#{topic.slug}/#{topic.id}?page=2" + expect(response.headers['X-Robots-Tag']).to be_nil + end + context "default locale" do before do SiteSetting.default_locale = :fr diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb index d918db850a..ff7b00a4a7 100644 --- a/spec/requests/groups_controller_spec.rb +++ b/spec/requests/groups_controller_spec.rb @@ -176,12 +176,6 @@ describe GroupsController do ) end - it 'should return correct X-Robots-Tag header when allow_index_in_robots_txt is set to false' do - SiteSetting.allow_index_in_robots_txt = false - get "/groups" - expect(response.headers['X-Robots-Tag']).to eq('noindex, nofollow') - end - context 'viewing groups of another user' do describe 'when an invalid username is given' do it 'should return the right response' do From d99deaf1ab27e24e42a88140a67aabfc907acd8c Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Thu, 25 Nov 2021 15:44:15 -0500 Subject: [PATCH 104/168] FEATURE: show recent searches in quick search panel (#15024) --- .../app/controllers/full-page-search.js | 4 + .../javascripts/discourse/app/lib/search.js | 14 +++ .../javascripts/discourse/app/models/user.js | 8 ++ .../app/widgets/search-menu-results.js | 60 +++++++++++- .../discourse/app/widgets/search-menu.js | 9 +- .../discourse/tests/acceptance/search-test.js | 22 +++++ .../discourse/tests/fixtures/user-fixtures.js | 7 ++ .../stylesheets/common/base/search-menu.scss | 22 ++++- app/controllers/users_controller.rb | 32 ++++++- app/models/search_log.rb | 3 +- app/models/user_option.rb | 1 + app/serializers/user_option_serializer.rb | 1 + config/locales/client.en.yml | 2 + config/locales/server.en.yml | 1 + config/routes.rb | 2 + .../20211123144714_add_recent_searches.rb | 9 ++ lib/search.rb | 2 +- .../api/schemas/json/user_get_response.json | 3 + spec/requests/users_controller_spec.rb | 91 +++++++++++++++++++ 19 files changed, 286 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20211123144714_add_recent_searches.rb diff --git a/app/assets/javascripts/discourse/app/controllers/full-page-search.js b/app/assets/javascripts/discourse/app/controllers/full-page-search.js index d27a5734f5..d75bc34c9b 100644 --- a/app/assets/javascripts/discourse/app/controllers/full-page-search.js +++ b/app/assets/javascripts/discourse/app/controllers/full-page-search.js @@ -5,6 +5,7 @@ import { isValidSearchTerm, searchContextDescription, translateResults, + updateRecentSearches, } from "discourse/lib/search"; import Category from "discourse/models/category"; import Composer from "discourse/models/composer"; @@ -345,6 +346,9 @@ export default Controller.extend({ }); break; default: + if (this.currentUser) { + updateRecentSearches(this.currentUser, searchTerm); + } ajax("/search", { data: args }) .then(async (results) => { const model = (await translateResults(results)) || {}; diff --git a/app/assets/javascripts/discourse/app/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js index 09cdeaea25..6df0545ede 100644 --- a/app/assets/javascripts/discourse/app/lib/search.js +++ b/app/assets/javascripts/discourse/app/lib/search.js @@ -17,6 +17,7 @@ import { userPath } from "discourse/lib/url"; import userSearch from "discourse/lib/user-search"; const translateResultsCallbacks = []; +const MAX_RECENT_SEARCHES = 5; // should match backend constant with the same name export function addSearchResultsCallback(callback) { translateResultsCallbacks.push(callback); @@ -230,3 +231,16 @@ export function applySearchAutocomplete($input, siteSettings) { ); } } + +export function updateRecentSearches(currentUser, term) { + let recentSearches = Object.assign(currentUser.recent_searches || []); + + if (recentSearches.includes(term)) { + recentSearches = recentSearches.without(term); + } else if (recentSearches.length === MAX_RECENT_SEARCHES) { + recentSearches.popObject(); + } + + recentSearches.unshiftObject(term); + currentUser.set("recent_searches", recentSearches); +} diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js index 2876dd604b..21434572c8 100644 --- a/app/assets/javascripts/discourse/app/models/user.js +++ b/app/assets/javascripts/discourse/app/models/user.js @@ -1072,6 +1072,14 @@ User.reopenClass(Singleton, { return ajax(userPath("check_email"), { data: { email } }); }, + loadRecentSearches() { + return ajax(`/u/recent-searches`); + }, + + resetRecentSearches() { + return ajax(`/u/recent-searches`, { type: "DELETE" }); + }, + groupStats(stats) { const responses = UserActionStat.create({ count: 0, diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js index d607ad3de5..ae3d08bbe2 100644 --- a/app/assets/javascripts/discourse/app/widgets/search-menu-results.js +++ b/app/assets/javascripts/discourse/app/widgets/search-menu-results.js @@ -8,10 +8,12 @@ import { dateNode } from "discourse/helpers/node"; import { emojiUnescape } from "discourse/lib/text"; import getURL from "discourse-common/lib/get-url"; import { h } from "virtual-dom"; +import hbs from "discourse/widgets/hbs-compiler"; import highlightSearch from "discourse/lib/highlight-search"; import { iconNode } from "discourse-common/lib/icon-library"; import renderTag from "discourse/lib/render-tag"; import { MODIFIER_REGEXP } from "discourse/widgets/search-menu"; +import User from "discourse/models/user"; const suggestionShortcuts = [ "in:title", @@ -585,6 +587,14 @@ createWidget("search-menu-initial-options", { if (content.length === 0) { content.push(this.attach("random-quick-tip")); + + if (this.currentUser && this.siteSettings.log_search_queries) { + if (this.currentUser.recent_searches?.length) { + content.push(this.attach("search-menu-recent-searches")); + } else { + this.loadRecentSearches(); + } + } } return content; @@ -602,6 +612,22 @@ createWidget("search-menu-initial-options", { ], }); }, + + refreshSearchMenuResults() { + this.scheduleRerender(); + }, + + loadRecentSearches() { + User.loadRecentSearches().then((result) => { + if (result.success && result.recent_searches?.length) { + this.currentUser.set( + "recent_searches", + Object.assign(result.recent_searches) + ); + this.scheduleRerender(); + } + }); + }, }); createWidget("search-menu-assistant-item", { @@ -612,7 +638,7 @@ createWidget("search-menu-assistant-item", { const attributes = {}; attributes.href = "#"; - let content = [iconNode("search")]; + let content = [iconNode(attrs.icon || "search")]; if (prefix) { content.push(h("span.search-item-prefix", `${prefix} `)); @@ -702,3 +728,35 @@ createWidget("random-quick-tip", { } }, }); + +createWidget("search-menu-recent-searches", { + tagName: "div.search-menu-recent", + + template: hbs` +
+

{{i18n "search.recent"}}

+ {{flat-button + className="clear-recent-searches" + title="search.clear_recent" + icon="times" + action="clearRecent" + }} +
+ + {{#each this.currentUser.recent_searches as |slug|}} + {{attach + widget="search-menu-assistant-item" + attrs=(hash slug=slug icon="history") + }} + {{/each}} + `, + + clearRecent() { + return User.resetRecentSearches().then((result) => { + if (result.success) { + this.currentUser.recent_searches.clear(); + this.sendWidgetAction("refreshSearchMenuResults"); + } + }); + }, +}); diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js index 8a76a33014..78f16baf16 100644 --- a/app/assets/javascripts/discourse/app/widgets/search-menu.js +++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js @@ -1,4 +1,8 @@ -import { isValidSearchTerm, searchForTerm } from "discourse/lib/search"; +import { + isValidSearchTerm, + searchForTerm, + updateRecentSearches, +} from "discourse/lib/search"; import DiscourseURL from "discourse/lib/url"; import { createWidget } from "discourse/widgets/widget"; import discourseDebounce from "discourse-common/lib/debounce"; @@ -456,6 +460,9 @@ export default createWidget("search-menu", { searchData.loading = true; cancel(this.state._debouncer); SearchHelper.perform(this); + if (this.currentUser) { + updateRecentSearches(this.currentUser, searchData.term); + } } else { searchData.loading = false; if (!this.state.inTopicContext) { diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js index 6be320421a..f5008978de 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js @@ -332,6 +332,7 @@ acceptance("Search - Anonymous", function (needs) { acceptance("Search - Authenticated", function (needs) { needs.user(); + needs.settings({ log_search_queries: true }); needs.pretender((server, helper) => { server.get("/search/query", (request) => { @@ -506,6 +507,27 @@ acceptance("Search - Authenticated", function (needs) { await triggerKeyEvent("#search-term", "keydown", keyEnter); assert.ok(exists(query(`.search-menu`)), "search dropdown is visible"); }); + + test("Shows recent search results", async function (assert) { + await visit("/"); + await click("#search-button"); + + assert.strictEqual( + query( + ".search-menu .search-menu-recent li:nth-of-type(1) .search-link" + ).textContent.trim(), + "yellow", + "shows first recent search" + ); + + assert.strictEqual( + query( + ".search-menu .search-menu-recent li:nth-of-type(2) .search-link" + ).textContent.trim(), + "blue", + "shows second recent search" + ); + }); }); acceptance("Search - with tagging enabled", function (needs) { diff --git a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js index 102d369ac8..0883ca4a6f 100644 --- a/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js +++ b/app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js @@ -3474,4 +3474,11 @@ export default { timezone: "Australia/Brisbane", }, }, + "/u/recent-searches": { + success: "OK", + recent_searches: [ + "yellow", + "blue" + ] + } }; diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss index 32935f37a8..898e5e60b5 100644 --- a/app/assets/stylesheets/common/base/search-menu.scss +++ b/app/assets/stylesheets/common/base/search-menu.scss @@ -229,6 +229,7 @@ $search-pad-horizontal: 0.5em; .search-result-tag, .search-menu-assistant { .search-link { + @include ellipsis; .d-icon { margin-right: 5px; vertical-align: middle; @@ -246,8 +247,7 @@ $search-pad-horizontal: 0.5em; .browser-search-tip, .search-random-quick-tip { - padding: $search-pad-vertical $search-pad-horizontal; - padding-bottom: 0; + padding: $search-pad-vertical 1px; font-size: var(--font-down-2); color: var(--primary-medium); .tip-label { @@ -261,6 +261,24 @@ $search-pad-horizontal: 0.5em; } } + .search-menu-recent { + @include separator; + + .heading { + display: flex; + justify-content: space-between; + h4 { + color: var(--primary-medium); + font-weight: normal; + margin-bottom: 0; + } + .clear-recent-searches { + cursor: pointer; + color: var(--primary-low-mid); + } + } + } + .browser-search-tip { padding-top: 0.5em; } diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3e2a815949..efc2b4984d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -11,7 +11,8 @@ class UsersController < ApplicationController :update_second_factor, :create_second_factor_backup, :select_avatar, :notification_level, :revoke_auth_token, :register_second_factor_security_key, :create_second_factor_security_key, :feature_topic, :clear_featured_topic, - :bookmarks, :invited, :check_sso_email, :check_sso_payload + :bookmarks, :invited, :check_sso_email, :check_sso_payload, + :recent_searches, :reset_recent_searches ] skip_before_action :check_xhr, only: [ @@ -50,6 +51,8 @@ class UsersController < ApplicationController after_action :add_noindex_header, only: [:show, :my_redirect] + MAX_RECENT_SEARCHES = 5 + def index end @@ -1302,6 +1305,33 @@ class UsersController < ApplicationController render json: success_json end + def recent_searches + if !SiteSetting.log_search_queries + return render json: failed_json.merge( + error: I18n.t("user_activity.no_log_search_queries") + ), status: 403 + end + + query = SearchLog.where(user_id: current_user.id) + + if current_user.user_option.oldest_search_log_date + query = query + .where("created_at > ?", current_user.user_option.oldest_search_log_date) + end + + results = query.group(:term) + .order("max(created_at) DESC") + .limit(MAX_RECENT_SEARCHES) + .pluck(:term) + + render json: success_json.merge(recent_searches: results) + end + + def reset_recent_searches + current_user.user_option.update!(oldest_search_log_date: 1.second.ago) + render json: success_json + end + def staff_info @user = fetch_user_from_params(include_inactive: true) guardian.ensure_can_see_staff_info!(@user) diff --git a/app/models/search_log.rb b/app/models/search_log.rb index 003331250b..ecaa2db6e7 100644 --- a/app/models/search_log.rb +++ b/app/models/search_log.rb @@ -187,5 +187,6 @@ end # # Indexes # -# index_search_logs_on_created_at (created_at) +# index_search_logs_on_created_at (created_at) +# index_search_logs_on_user_id_and_created_at (user_id,created_at) WHERE (user_id IS NOT NULL) # diff --git a/app/models/user_option.rb b/app/models/user_option.rb index 47afb7d2d2..9a396827bf 100644 --- a/app/models/user_option.rb +++ b/app/models/user_option.rb @@ -259,6 +259,7 @@ end # skip_new_user_tips :boolean default(FALSE), not null # color_scheme_id :integer # default_calendar :integer default("none_selected"), not null +# oldest_search_log_date :datetime # # Indexes # diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb index a4c9826ba3..a086a6f3ee 100644 --- a/app/serializers/user_option_serializer.rb +++ b/app/serializers/user_option_serializer.rb @@ -34,6 +34,7 @@ class UserOptionSerializer < ApplicationSerializer :timezone, :skip_new_user_tips, :default_calendar, + :oldest_search_log_date, def auto_track_topics_after_msecs object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 30d77f99d2..556c656765 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2384,6 +2384,8 @@ en: in_posts_by: "in posts by %{username}" browser_tip: "%{modifier} + f" browser_tip_description: "again to use native browser search" + recent: "Recent Searches" + clear_recent: "Clear Recent Searches" type: default: "Topics/posts" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index c090367f9e..6f8f2f9577 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -968,6 +968,7 @@ en: others: "No bookmarks." no_drafts: self: "You have no drafts; begin composing a reply in any topic and it will be auto-saved as a new draft." + no_log_search_queries: "Search log queries are currently disabled (an administrator can enable them in site settings)." email_settings: pop3_authentication_error: "There was an issue with the POP3 credentials provided, check the username and password and try again." diff --git a/config/routes.rb b/config/routes.rb index 943a773fff..4444f1e92d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -428,6 +428,8 @@ Discourse::Application.routes.draw do put "#{root_path}/admin-login" => "users#admin_login" post "#{root_path}/toggle-anon" => "users#toggle_anon" post "#{root_path}/read-faq" => "users#read_faq" + get "#{root_path}/recent-searches" => "users#recent_searches", constraints: { format: 'json' } + delete "#{root_path}/recent-searches" => "users#reset_recent_searches", constraints: { format: 'json' } get "#{root_path}/search/users" => "users#search_users" get({ "#{root_path}/account-created/" => "users#account_created" }.merge(index == 1 ? { as: :users_account_created } : { as: :old_account_created })) diff --git a/db/migrate/20211123144714_add_recent_searches.rb b/db/migrate/20211123144714_add_recent_searches.rb new file mode 100644 index 0000000000..0e586f6afb --- /dev/null +++ b/db/migrate/20211123144714_add_recent_searches.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddRecentSearches < ActiveRecord::Migration[6.1] + def change + add_column :user_options, :oldest_search_log_date, :datetime + + add_index :search_logs, [:user_id, :created_at], where: 'user_id IS NOT NULL' + end +end diff --git a/lib/search.rb b/lib/search.rb index 6230955b6a..c5abbc503e 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -254,7 +254,7 @@ class Search def execute(readonly_mode: Discourse.readonly_mode?) if log_query?(readonly_mode) status, search_log_id = SearchLog.log( - term: @term, + term: @clean_term, search_type: @opts[:search_type], ip_address: @opts[:ip_address], user_id: @opts[:user_id] diff --git a/spec/requests/api/schemas/json/user_get_response.json b/spec/requests/api/schemas/json/user_get_response.json index d0f019cb72..d6261a91bc 100644 --- a/spec/requests/api/schemas/json/user_get_response.json +++ b/spec/requests/api/schemas/json/user_get_response.json @@ -778,6 +778,9 @@ }, "default_calendar": { "type": "string" + }, + "oldest_search_log_date": { + "type": ["string", "null"] } }, "required": [ diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index bbe67e69ad..637cbe399d 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -5125,6 +5125,97 @@ describe UsersController do end end + describe "#reset_recent_searches" do + fab!(:user) { Fabricate(:user) } + + it 'does nothing for anon' do + delete "/u/recent-searches.json" + expect(response.status).to eq(403) + end + + it 'works for logged in user' do + sign_in(user) + delete "/u/recent-searches.json" + + expect(response.status).to eq(200) + user.reload + expect(user.user_option.oldest_search_log_date).to be_within(5.seconds).of(1.second.ago) + end + end + + describe "#recent_searches" do + fab!(:user) { Fabricate(:user) } + + it 'does nothing for anon' do + get "/u/recent-searches.json" + expect(response.status).to eq(403) + end + + it 'works for logged in user' do + sign_in(user) + SiteSetting.log_search_queries = true + user.user_option.update!(oldest_search_log_date: nil) + + get "/u/recent-searches.json" + + expect(response.status).to eq(200) + expect(response.parsed_body["recent_searches"]).to eq([]) + + SearchLog.create!( + term: "old one", + user_id: user.id, + search_type: 1, + ip_address: '192.168.0.1', + created_at: 5.minutes.ago + ) + SearchLog.create!( + term: "also old", + user_id: user.id, + search_type: 1, + ip_address: '192.168.0.1', + created_at: 15.minutes.ago + ) + + get "/u/recent-searches.json" + expect(response.status).to eq(200) + expect(response.parsed_body["recent_searches"]).to eq(["old one", "also old"]) + + user.user_option.update!(oldest_search_log_date: 20.minutes.ago) + + get "/u/recent-searches.json" + expect(response.status).to eq(200) + expect(response.parsed_body["recent_searches"]).to eq(["old one", "also old"]) + + user.user_option.update!(oldest_search_log_date: 10.seconds.ago) + + get "/u/recent-searches.json" + expect(response.status).to eq(200) + expect(response.parsed_body["recent_searches"]).to eq([]) + + SearchLog.create!( + term: "new search", + user_id: user.id, + search_type: 1, + ip_address: '192.168.0.1', + created_at: 2.seconds.ago + ) + + get "/u/recent-searches.json" + expect(response.status).to eq(200) + expect(response.parsed_body["recent_searches"]).to eq(["new search"]) + end + + it 'shows an error message when log_search_queries are off' do + sign_in(user) + SiteSetting.log_search_queries = false + + get "/u/recent-searches.json" + + expect(response.status).to eq(403) + expect(response.parsed_body["error"]).to eq(I18n.t("user_activity.no_log_search_queries")) + end + end + def create_second_factor_security_key sign_in(user) stub_secure_session_confirmed From 78830d14b2bd4694abcfc7ac872358fdabe02c32 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Thu, 25 Nov 2021 15:44:40 -0500 Subject: [PATCH 105/168] DEV: Cancel in-progress test runs on PRs (#15096) --- .github/workflows/ember.yml | 4 ++++ .github/workflows/linting.yml | 4 ++++ .github/workflows/tests.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/ember.yml b/.github/workflows/ember.yml index b906767d01..8a727a4f0d 100644 --- a/.github/workflows/ember.yml +++ b/.github/workflows/ember.yml @@ -6,6 +6,10 @@ on: branches: - main +concurrency: + group: ember-${{ format('{0}-{1}', github.head_ref, github.job) || format('{0}-{1}', github.ref, github.run_number) }} + cancel-in-progress: true + jobs: build: name: run diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index ac5b712d03..11acb6e7a3 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -6,6 +6,10 @@ on: branches: - main +concurrency: + group: linting-${{ format('{0}-{1}', github.head_ref, github.job) || format('{0}-{1}', github.ref, github.run_number) }} + cancel-in-progress: true + jobs: build: name: run diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 21234f82ad..4a760b1287 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,6 +6,10 @@ on: branches: - main +concurrency: + group: tests-${{ format('{0}-{1}', github.head_ref, github.job) || format('{0}-{1}', github.ref, github.run_number) }} + cancel-in-progress: true + jobs: build: name: ${{ matrix.target }} ${{ matrix.build_type }} From cef0e1f8ff2e14579a08f0d6d9a2c01ce9879ba2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Nov 2021 22:39:41 +0100 Subject: [PATCH 106/168] Build(deps): Bump globalid from 0.5.2 to 0.6.0 (#15098) Bumps [globalid](https://github.com/rails/globalid) from 0.5.2 to 0.6.0. - [Release notes](https://github.com/rails/globalid/releases) - [Commits](https://github.com/rails/globalid/compare/v0.5.2...v0.6.0) --- updated-dependencies: - dependency-name: globalid dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3f0b646e0b..6483128526 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -161,7 +161,7 @@ GEM ffi (1.15.4) fspath (3.1.2) gc_tracer (1.5.1) - globalid (0.5.2) + globalid (0.6.0) activesupport (>= 5.0) guess_html_encoding (0.0.11) hana (1.3.7) From af241c73263440452cc0c2b35791b13e8f0f0bc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Nov 2021 22:39:52 +0100 Subject: [PATCH 107/168] Build(deps): Bump parser from 3.0.2.0 to 3.0.3.0 (#15099) Bumps [parser](https://github.com/whitequark/parser) from 3.0.2.0 to 3.0.3.0. - [Release notes](https://github.com/whitequark/parser/releases) - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v3.0.2.0...v3.0.3.0) --- updated-dependencies: - dependency-name: parser dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6483128526..f8d1d18193 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -291,7 +291,7 @@ GEM parallel (1.21.0) parallel_tests (3.7.3) parallel - parser (3.0.2.0) + parser (3.0.3.0) ast (~> 2.4.1) pg (1.2.3) progress (3.6.0) From c3eb75bf00dd3c2be4231ddab65d38fc8b9cd823 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 25 Nov 2021 22:55:37 +0100 Subject: [PATCH 108/168] DEV: Don't crash on empty plugin translations (#15097) ember build would throw and exit on: ```yml # plugins/my_plugin/config/locales/client.en.yml en: js: my_plugin: ``` --- app/assets/javascripts/discourse/lib/translation-plugin.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/javascripts/discourse/lib/translation-plugin.js b/app/assets/javascripts/discourse/lib/translation-plugin.js index 0fb923c52e..09c0e8b84d 100644 --- a/app/assets/javascripts/discourse/lib/translation-plugin.js +++ b/app/assets/javascripts/discourse/lib/translation-plugin.js @@ -20,6 +20,10 @@ class TranslationPlugin extends Plugin { } replaceMF(formats, input, path = []) { + if (!input) { + return; + } + Object.keys(input).forEach((key) => { let value = input[key]; From 9123f471e86299b8f0a7212cf891e9c881435407 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 25 Nov 2021 16:31:22 -0500 Subject: [PATCH 109/168] FIX: Don't throw errors on duplicate keys in Yaml We shouldn't have them, but they shouldn't break a build either. --- app/assets/javascripts/discourse/lib/translation-plugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/translation-plugin.js b/app/assets/javascripts/discourse/lib/translation-plugin.js index 09c0e8b84d..a8551d0b9e 100644 --- a/app/assets/javascripts/discourse/lib/translation-plugin.js +++ b/app/assets/javascripts/discourse/lib/translation-plugin.js @@ -51,7 +51,7 @@ class TranslationPlugin extends Plugin { this.inputPaths.forEach((path) => { let file = path + "/" + this.inputFile; let yaml = fs.readFileSync(file, { encoding: "UTF-8" }); - let loaded = Yaml.load(yaml); + let loaded = Yaml.load(yaml, { json: true }); parsed = deepmerge(parsed, loaded); }); From 1b5f26e0ab9b50af03c94f797791fc12e7bd94b4 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Thu, 25 Nov 2021 17:31:05 -0500 Subject: [PATCH 110/168] DEV: Avoid cancelling in-progress tests for branches (#15101) --- .github/workflows/ember.yml | 2 +- .github/workflows/linting.yml | 2 +- .github/workflows/tests.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ember.yml b/.github/workflows/ember.yml index 8a727a4f0d..8c7148182c 100644 --- a/.github/workflows/ember.yml +++ b/.github/workflows/ember.yml @@ -7,7 +7,7 @@ on: - main concurrency: - group: ember-${{ format('{0}-{1}', github.head_ref, github.job) || format('{0}-{1}', github.ref, github.run_number) }} + group: ember-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }} cancel-in-progress: true jobs: diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 11acb6e7a3..b1e756e2bd 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -7,7 +7,7 @@ on: - main concurrency: - group: linting-${{ format('{0}-{1}', github.head_ref, github.job) || format('{0}-{1}', github.ref, github.run_number) }} + group: linting-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }} cancel-in-progress: true jobs: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4a760b1287..7f52de106f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ on: - main concurrency: - group: tests-${{ format('{0}-{1}', github.head_ref, github.job) || format('{0}-{1}', github.ref, github.run_number) }} + group: tests-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }} cancel-in-progress: true jobs: From 73db60ad2ad623ecf79f4296f97fb68f6439447b Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Fri, 26 Nov 2021 11:13:15 +1000 Subject: [PATCH 111/168] DEV: Add 201 to bootstrap-json accepted status codes (#15102) The theme creator endpoints return JSON with a 201 CREATED status code. With the recent changes to bootstrap-json/index.js for the Ember CLI proxy, these endpoints were broken because 201 was not an accepted status code. This commit simply adds 201 to the array, but prettier forced a reformat as well! --- .../discourse/lib/bootstrap-json/index.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js index 4295eebc9d..1685d5328e 100644 --- a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js +++ b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js @@ -230,7 +230,18 @@ async function handleRequest(proxy, baseURL, req, res) { req.headers["X-Discourse-Asset-Path"] = req.path; } - const acceptedStatusCodes = [200, 301, 302, 303, 307, 308, 404, 403, 500]; + const acceptedStatusCodes = [ + 200, + 201, + 301, + 302, + 303, + 307, + 308, + 404, + 403, + 500, + ]; const proxyRequest = bent(req.method, acceptedStatusCodes); const requestBody = req.method === "GET" ? null : req.body; const response = await proxyRequest(url, requestBody, req.headers); From 1441226b1a0c95ad4ffbf784f5b55dc207447349 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Fri, 26 Nov 2021 03:17:10 +0100 Subject: [PATCH 112/168] DEV: Don't polute all ActiveRecord classes (#15103) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `pending`, `approved`, `rejected`, `ignored`, and `deleted` scope method were accessible on all model classes… 😂 Fixes `Creating scope :pending. Overwriting existing method DiscoursePostEvent::EventDate.pending.` warnings. --- app/models/reviewable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb index 08d0264419..27baea21cf 100644 --- a/app/models/reviewable.rb +++ b/app/models/reviewable.rb @@ -80,7 +80,7 @@ class Reviewable < ActiveRecord::Base # Generate `pending?`, `rejected?`, etc helper methods statuses.each do |name, id| define_method("#{name}?") { status == id } - self.class.define_method(name) { where(status: id) } + singleton_class.define_method(name) { where(status: id) } end def self.default_visible From 4d3eb3f1acfc307e808c4f788c8683cc5c2da316 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 26 Nov 2021 15:25:03 +0000 Subject: [PATCH 113/168] PERF: Set --header-offset property only when changed (#15107) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Calling `setProperty("--header-offset", newValue)` will always cause a 'Recalculate Style' event, even if the value is unchanged. On my browser, these 'Recalculate Style' events take about 6-7ms each time the `dockCheck` function is run. This commit stores the 'previous' value in an instance variable, and only calls setProperty if the value has changed. This brings the total runtime of `dockCheck` down to about 70µs on my machine. --- .../javascripts/discourse/app/components/site-header.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/components/site-header.js b/app/assets/javascripts/discourse/app/components/site-header.js index 6be70db36f..32045dec66 100644 --- a/app/assets/javascripts/discourse/app/components/site-header.js +++ b/app/assets/javascripts/discourse/app/components/site-header.js @@ -186,7 +186,13 @@ const SiteHeaderComponent = MountWidget.extend( const headerRect = header.getBoundingClientRect(), headerOffset = headerRect.top + headerRect.height, doc = document.documentElement; - doc.style.setProperty("--header-offset", `${headerOffset}px`); + + const newValue = `${headerOffset}px`; + if (newValue !== this.currentHeaderOffsetValue) { + this.currentHeaderOffsetValue = newValue; + doc.style.setProperty("--header-offset", newValue); + } + if (offset >= this.docAt) { if (!this.dockedHeader) { document.body.classList.add("docked"); From 2971d033077e593ed69ff752502578cb35e56de3 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Fri, 26 Nov 2021 16:34:07 +0100 Subject: [PATCH 114/168] DEV: Don't create unnecessary scope methods (#15104) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Skipping methods we don't use gives us mem/perf gains (minuscule but still), but more importantly fixes warnings about `Poll#open` (created by `enum :status`) conflicting with some internal AR method. 😃 --- app/models/directory_column.rb | 2 +- app/models/user_option.rb | 2 +- plugins/poll/app/models/poll.rb | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/directory_column.rb b/app/models/directory_column.rb index aaeadbf7ae..3a290432c2 100644 --- a/app/models/directory_column.rb +++ b/app/models/directory_column.rb @@ -6,7 +6,7 @@ class DirectoryColumn < ActiveRecord::Base self.ignored_columns = ["automatic"] self.inheritance_column = nil - enum type: { automatic: 0, user_field: 1, plugin: 2 } + enum type: { automatic: 0, user_field: 1, plugin: 2 }, _scopes: false def self.automatic_column_names @automatic_column_names ||= [:likes_received, diff --git a/app/models/user_option.rb b/app/models/user_option.rb index 9a396827bf..75003f4345 100644 --- a/app/models/user_option.rb +++ b/app/models/user_option.rb @@ -11,7 +11,7 @@ class UserOption < ActiveRecord::Base after_save :update_tracked_topics - enum default_calendar: { none_selected: 0, ics: 1, google: 2 } + enum default_calendar: { none_selected: 0, ics: 1, google: 2 }, _scopes: false def self.ensure_consistency! sql = <<~SQL diff --git a/plugins/poll/app/models/poll.rb b/plugins/poll/app/models/poll.rb index b923caff99..fe00c63509 100644 --- a/plugins/poll/app/models/poll.rb +++ b/plugins/poll/app/models/poll.rb @@ -13,29 +13,29 @@ class Poll < ActiveRecord::Base regular: 0, multiple: 1, number: 2, - } + }, _scopes: false enum status: { open: 0, closed: 1, - } + }, _scopes: false enum results: { always: 0, on_vote: 1, on_close: 2, staff_only: 3, - } + }, _scopes: false enum visibility: { secret: 0, everyone: 1, - } + }, _scopes: false enum chart_type: { bar: 0, pie: 1 - } + }, _scopes: false validates :min, numericality: { allow_nil: true, only_integer: true, greater_than_or_equal_to: 0 } validates :max, numericality: { allow_nil: true, only_integer: true, greater_than: 0 } From f1178514fa16a337a57d56fce319380100bc58fc Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 11 Nov 2021 16:49:24 -0500 Subject: [PATCH 115/168] Segment Ember CLI tests Note `/topics/bulk` missing the first slash seems to expose an error not present without segmentation. --- .github/workflows/ember.yml | 20 +++++++++++++++++-- .../acceptance/user-activity-topic-test.js | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ember.yml b/.github/workflows/ember.yml index 8c7148182c..f2f17a729c 100644 --- a/.github/workflows/ember.yml +++ b/.github/workflows/ember.yml @@ -49,7 +49,23 @@ jobs: working-directory: ./app/assets/javascripts/discourse run: yarn install - - name: Core QUnit + - name: Ember Build working-directory: ./app/assets/javascripts/discourse - run: sudo -E -u discourse -H yarn ember test --launch "${{ matrix.browser }}" + run: | + sudo -E -u discourse mkdir /tmp/emberbuild + sudo -E -u discourse -H yarn ember build --environment=test -o /tmp/emberbuild + + - name: Core QUnit 1 + working-directory: ./app/assets/javascripts/discourse + run: sudo -E -u discourse -H yarn ember exam --path /tmp/emberbuild --split=3 --partition=1 --launch "${{ matrix.browser }}" + timeout-minutes: 60 + + - name: Core QUnit 2 + working-directory: ./app/assets/javascripts/discourse + run: sudo -E -u discourse -H yarn ember exam --path /tmp/emberbuild --split=3 --partition=2 --launch "${{ matrix.browser }}" + timeout-minutes: 60 + + - name: Core QUnit 3 + working-directory: ./app/assets/javascripts/discourse + run: sudo -E -u discourse -H yarn ember exam --path /tmp/emberbuild --split=3 --partition=3 --launch "${{ matrix.browser }}" timeout-minutes: 60 diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-activity-topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-activity-topic-test.js index 623d68f7de..e669d1e20b 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/user-activity-topic-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/user-activity-topic-test.js @@ -11,7 +11,7 @@ acceptance("User Activity / Topics - bulk actions", function (needs) { return helper.response(userFixtures["/topics/created-by/eviltrout.json"]); }); - server.put("topics/bulk", () => { + server.put("/topics/bulk", () => { return helper.response({ topic_ids: [7764, 9318] }); }); }); From a12b73f88150e26bd55b95be460f26e1397dc82d Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Fri, 26 Nov 2021 12:32:45 -0500 Subject: [PATCH 116/168] UX: Fix extra indent on lists when supporting mixed text direction (#15110) --- app/assets/stylesheets/common/base/rtl.scss | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss index 6125126757..e59c05f821 100644 --- a/app/assets/stylesheets/common/base/rtl.scss +++ b/app/assets/stylesheets/common/base/rtl.scss @@ -55,21 +55,14 @@ float: left !important; } -// This is for the support_mixed_text_direction setting -.cooked ul[dir="ltr"], -.d-editor-preview ul[dir="ltr"], -.rtl .cooked ul[dir="rtl"], -.rtl .d-editor-preview ul[dir="rtl"] { - padding-left: 40px; - padding-right: 0; -} - -.cooked ul[dir="rtl"], -.d-editor-preview ul[dir="rtl"], +// For the support_mixed_text_direction setting +html:not(.rtl) .cooked ul[dir="rtl"], +html:not(.rtl) .d-editor-preview ul[dir="rtl"], .rtl .cooked ul[dir="ltr"], .rtl .d-editor-preview ul[dir="ltr"] { padding-left: 0; - padding-right: 40px; + padding-right: 1.25em; + margin-right: 1.25em; } // Fixes github oneboxes for RTL sites From ff72522f30028952ffc531f7af7ddb280842a037 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 26 Nov 2021 16:11:40 +0000 Subject: [PATCH 117/168] PERF: Use passive event listeners for touchstart, touchmove None of these places call `event.preventDefault()`. Therefore we can register the event listeners as 'passive', and improve scroll performance on mobile devices. --- .../discourse/app/components/composer-editor.js | 8 ++++++-- .../app/components/scrolling-post-stream.js | 15 +++++++++------ .../javascripts/discourse/app/lib/lock-on.js | 2 +- .../javascripts/discourse/app/mixins/docking.js | 6 ++++-- .../discourse/app/mixins/pan-events.js | 11 +++++++---- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js index a32f47eaf9..a5287c8eef 100644 --- a/app/assets/javascripts/discourse/app/components/composer-editor.js +++ b/app/assets/javascripts/discourse/app/components/composer-editor.js @@ -360,10 +360,14 @@ export default Component.extend(ComposerUpload, { }); schedule("afterRender", () => { - input?.addEventListener("touchstart", this._handleInputInteraction); + input?.addEventListener("touchstart", this._handleInputInteraction, { + passive: true, + }); input?.addEventListener("mouseenter", this._handleInputInteraction); - preview?.addEventListener("touchstart", this._handlePreviewInteraction); + preview?.addEventListener("touchstart", this._handlePreviewInteraction, { + passive: true, + }); preview?.addEventListener("mouseenter", this._handlePreviewInteraction); }); }, diff --git a/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js b/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js index 8234c21b36..c634f0336e 100644 --- a/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js +++ b/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js @@ -6,6 +6,7 @@ import discourseDebounce from "discourse-common/lib/debounce"; import { isWorkaroundActive } from "discourse/lib/safari-hacks"; import offsetCalculator from "discourse/lib/offset-calculator"; import { inject as service } from "@ember/service"; +import { bind } from "discourse-common/utils/decorators"; const DEBOUNCE_DELAY = 50; @@ -320,19 +321,21 @@ export default MountWidget.extend({ this.queueRerender(); }, + @bind _debouncedScroll() { discourseDebounce(this, this._scrollTriggered, DEBOUNCE_DELAY); }, didInsertElement() { this._super(...arguments); - const debouncedScroll = () => - discourseDebounce(this, this._scrollTriggered, DEBOUNCE_DELAY); this._previouslyNearby = {}; this.appEvents.on("post-stream:refresh", this, "_debouncedScroll"); - $(document).bind("touchmove.post-stream", debouncedScroll); - $(window).bind("scroll.post-stream", debouncedScroll); + const opts = { + passive: true, + }; + document.addEventListener("touchmove", this._debouncedScroll, opts); + window.addEventListener("scroll", this._debouncedScroll, opts); this._scrollTriggered(); this.appEvents.on("post-stream:posted", this, "_posted"); @@ -362,8 +365,8 @@ export default MountWidget.extend({ willDestroyElement() { this._super(...arguments); - $(document).unbind("touchmove.post-stream"); - $(window).unbind("scroll.post-stream"); + document.removeEventListener("touchmove", this._debouncedScrollCallback); + window.removeEventListener("scroll", this._debouncedScrollCallback); this.appEvents.off("post-stream:refresh", this, "_debouncedScroll"); $(this.element).off("mouseenter.post-stream"); $(this.element).off("mouseleave.post-stream"); diff --git a/app/assets/javascripts/discourse/app/lib/lock-on.js b/app/assets/javascripts/discourse/app/lib/lock-on.js index b8a86ae2f6..32a92b342b 100644 --- a/app/assets/javascripts/discourse/app/lib/lock-on.js +++ b/app/assets/javascripts/discourse/app/lib/lock-on.js @@ -87,7 +87,7 @@ export default class LockOn { const body = document.querySelector("body"); SCROLL_EVENTS.forEach((event) => { - body.addEventListener(event, this._scrollListener); + body.addEventListener(event, this._scrollListener, { passive: true }); }); } diff --git a/app/assets/javascripts/discourse/app/mixins/docking.js b/app/assets/javascripts/discourse/app/mixins/docking.js index e8de346cbc..e97638ae5a 100644 --- a/app/assets/javascripts/discourse/app/mixins/docking.js +++ b/app/assets/javascripts/discourse/app/mixins/docking.js @@ -32,8 +32,10 @@ export default Mixin.create({ didInsertElement() { this._super(...arguments); - window.addEventListener("scroll", this.queueDockCheck); - document.addEventListener("touchmove", this.queueDockCheck); + window.addEventListener("scroll", this.queueDockCheck, { passive: true }); + document.addEventListener("touchmove", this.queueDockCheck, { + passive: true, + }); // dockCheck might happen too early on full page refresh this._initialTimer = later(this, this.safeDockCheck, 50); diff --git a/app/assets/javascripts/discourse/app/mixins/pan-events.js b/app/assets/javascripts/discourse/app/mixins/pan-events.js index 0134647267..63db26161a 100644 --- a/app/assets/javascripts/discourse/app/mixins/pan-events.js +++ b/app/assets/javascripts/discourse/app/mixins/pan-events.js @@ -33,10 +33,13 @@ export default Mixin.create({ this.touchEnd = (e) => this._panMove({ type: "pointerup" }, e); this.touchCancel = (e) => this._panMove({ type: "pointercancel" }, e); - element.addEventListener("touchstart", this.touchStart); - element.addEventListener("touchmove", this.touchMove); - element.addEventListener("touchend", this.touchEnd); - element.addEventListener("touchcancel", this.touchCancel); + const opts = { + passive: true, + }; + element.addEventListener("touchstart", this.touchStart, opts); + element.addEventListener("touchmove", this.touchMove, opts); + element.addEventListener("touchend", this.touchEnd, opts); + element.addEventListener("touchcancel", this.touchCancel, opts); } }, From 4229e3f22caac7ded114340596af0dd8a4fbad2e Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 26 Nov 2021 16:17:00 +0000 Subject: [PATCH 118/168] DEV: Set `passive: false` on composer grippie events We do call `event.preventDefault()` on these events. They're limited to a single element, so performance impact should be negligable. Adding `passive: false` prevents the chrome dev tools warning. --- .../javascripts/discourse/app/components/composer-body.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/components/composer-body.js b/app/assets/javascripts/discourse/app/components/composer-body.js index fb8bf92456..4be24a8df8 100644 --- a/app/assets/javascripts/discourse/app/components/composer-body.js +++ b/app/assets/javascripts/discourse/app/components/composer-body.js @@ -112,7 +112,9 @@ export default Component.extend(KeyEnterEscape, { START_DRAG_EVENTS.forEach((startDragEvent) => { this.element .querySelector(".grippie") - ?.addEventListener(startDragEvent, this.startDragHandler); + ?.addEventListener(startDragEvent, this.startDragHandler, { + passive: false, + }); }); if (this._visualViewportResizing()) { From fac6cc0778e6051cea7195fd3e1282d6a619a097 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Fri, 26 Nov 2021 20:16:08 +0100 Subject: [PATCH 119/168] DEV: Make `@afterRender` do just that, no extra `next()` (#15086) --- .../addon/utils/decorators.js | 12 +++---- .../discourse/app/components/cook-text.js | 32 ++++++++----------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/app/assets/javascripts/discourse-common/addon/utils/decorators.js b/app/assets/javascripts/discourse-common/addon/utils/decorators.js index a7f1d0a53d..3439a4239f 100644 --- a/app/assets/javascripts/discourse-common/addon/utils/decorators.js +++ b/app/assets/javascripts/discourse-common/addon/utils/decorators.js @@ -1,4 +1,4 @@ -import { bind as emberBind, next, schedule } from "@ember/runloop"; +import { bind as emberBind, schedule } from "@ember/runloop"; import decoratorAlias from "discourse-common/utils/decorator-alias"; import extractValue from "discourse-common/utils/extract-value"; import handleDescriptor from "discourse-common/utils/handle-descriptor"; @@ -19,12 +19,10 @@ export default function discourseComputedDecorator(...params) { export function afterRender(target, name, descriptor) { const originalFunction = descriptor.value; descriptor.value = function () { - next(() => { - schedule("afterRender", () => { - if (this.element && !this.isDestroying && !this.isDestroyed) { - return originalFunction.apply(this, arguments); - } - }); + schedule("afterRender", () => { + if (this.element && !this.isDestroying && !this.isDestroyed) { + return originalFunction.apply(this, arguments); + } }); }; } diff --git a/app/assets/javascripts/discourse/app/components/cook-text.js b/app/assets/javascripts/discourse/app/components/cook-text.js index 87765cc40b..a45339bd40 100644 --- a/app/assets/javascripts/discourse/app/components/cook-text.js +++ b/app/assets/javascripts/discourse/app/components/cook-text.js @@ -1,5 +1,4 @@ import Component from "@ember/component"; -import { afterRender } from "discourse-common/utils/decorators"; import { ajax } from "discourse/lib/ajax"; import { cookAsync } from "discourse/lib/text"; import { loadOneboxes } from "discourse/lib/load-oneboxes"; @@ -10,31 +9,26 @@ const CookText = Component.extend({ didReceiveAttrs() { this._super(...arguments); + cookAsync(this.rawText).then((cooked) => { this.set("cooked", cooked); - if (this.paintOneboxes) { - this._loadOneboxes(); - } - this._resolveUrls(); }); }, - @afterRender - _loadOneboxes() { - const refresh = false; + didRender() { + this._super(...arguments); - loadOneboxes( - this.element, - ajax, - this.topicId, - this.categoryId, - this.siteSettings.max_oneboxes_per_post, - refresh - ); - }, + if (this.paintOneboxes) { + loadOneboxes( + this.element, + ajax, + this.topicId, + this.categoryId, + this.siteSettings.max_oneboxes_per_post, + false // refresh + ); + } - @afterRender - _resolveUrls() { resolveAllShortUrls(ajax, this.siteSettings, this.element, this.opts); }, }); From e8bb37bd896959e37cf14bb95d1487fe5ca77378 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 26 Nov 2021 20:22:02 +0000 Subject: [PATCH 120/168] PERF: Disable ember touchstart listener (#15112) Registering non-passive listeners for the touchstart event can affect scroll performance on mobile devices, and now shows a warning in Chrome. Our current version of Ember unconditionally registers all event listeners, even if they're unused. It also doesn't support passive event listeners. Once we get to Ember 4.0, it lazily registers event listeners, and supports passive listeners via the `{{on` helper. We already disable the ember `mousemove` and `touchmove` events for performance, so it makes sense to do the same for `touchstart`. We are not using `touchstart` anywhere in core, and I cannot find any official/unofficial plugins which use it. If a `touchstart` event is required, plugins/themes can always register their own listeners (preferably on a specific element, rather than the whole `document`) --- .../javascripts/discourse/app/initializers/ember-events.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/app/initializers/ember-events.js b/app/assets/javascripts/discourse/app/initializers/ember-events.js index 4696e81293..6a2e14d344 100644 --- a/app/assets/javascripts/discourse/app/initializers/ember-events.js +++ b/app/assets/javascripts/discourse/app/initializers/ember-events.js @@ -5,14 +5,13 @@ export default { initialize() { // By default Ember listens to too many events. This tells it the only events - // we're interested in. (it removes mousemove and touchmove) + // we're interested in. (it removes mousemove, touchstart and touchmove) if (initializedOnce) { return; } Ember.EventDispatcher.reopen({ events: { - touchstart: "touchStart", touchend: "touchEnd", touchcancel: "touchCancel", keydown: "keyDown", From 5d59b7e733acdc4f489683d88370dc7890768766 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 26 Nov 2021 20:22:29 +0000 Subject: [PATCH 121/168] DEV: Make plugin api errors more descriptive (#15111) With more descriptive errors, developers will know **why** a change is required, and may be more likely to take action. --- app/assets/javascripts/discourse/app/lib/plugin-api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js index b897b219f4..d11adef5f1 100644 --- a/app/assets/javascripts/discourse/app/lib/plugin-api.js +++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js @@ -102,7 +102,7 @@ function canModify(klass, type, resolverName, changes) { if (!changes.pluginId) { // eslint-disable-next-line no-console console.warn( - "To prevent errors, add a `pluginId` key to your changes when calling `modifyClass`" + "To prevent errors in tests, add a `pluginId` key to your `modifyClass` call. This will ensure the modification is only applied once." ); return true; } @@ -1629,7 +1629,7 @@ function decorate(klass, evt, cb, id) { if (!id) { // eslint-disable-next-line no-console console.warn( - "`decorateCooked` should be supplied with an `id` option to avoid memory leaks." + "`decorateCooked` should be supplied with an `id` option to avoid memory leaks in test mode. The id will be used to ensure the decorator is only applied once." ); } else { if (!_decorated.has(klass)) { From 1b184cefd0270171b516ff0c0a5ecc11fb4a2790 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 26 Nov 2021 20:22:50 +0000 Subject: [PATCH 122/168] PERF: Update scrolling mixin implementation (#15109) This mixin calls the "scrolled" method of some object with no parameters, so there is no way that consumers would ever call `event.preventDefault()`. Therefore we can make the listeners passive, and improve scrolling performance on mobile. This commit also updates the mixin to remove JQuery usage. The API is slightly modified to remove the need for an event 'name' for binding/unbinding. The calls to `.bindScrolling` and `.unbindScrolling` in user-stream.js are removed because they are already called by the LoadMore mixin which is applied to the component. The `bindScrolling` method claimed to offer debouncing-by-default. However, a bug in the `opts` parsing meant that debouncing was skipped if a 'name' was passed in. Therefore the only consumer actually being debounced was the LoadMore mixin. This commit fixes the opts parsing, so all consumers get the same behavior. However, when scrolling, debounce is rarely what we want. The documentation of `bindScrolling` says "called every 100ms". In fact, debounce means that the functions were only called 'after the user **stops scrolling** for 100ms'. If you're scrolling very slowly (e.g. when using momentum-based scrolling on mobile), then this can be quite frustrating. This is why "Load more" is only triggered on topics/topic-lists when you completely stop scrolling. Therefore, this commit also replaces the default 'debounce' with a 'throttle'. The 'throttle' is configured with `immediate = false`, so that it fires on the trailing edge, and therefore the final call will always be **after** we finish scrolling. (the default `immediate: true` would fire on the leading edge, and so the last call could be up to 100ms **before** we finish scrolling). --- .../app/components/discourse-topic.js | 4 +- .../discourse/app/components/footer-nav.js | 4 +- .../app/components/scroll-tracker.js | 4 +- .../discourse/app/components/user-stream.js | 3 -- .../discourse/app/mixins/scrolling.js | 48 +++++++++---------- 5 files changed, 30 insertions(+), 33 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/discourse-topic.js b/app/assets/javascripts/discourse/app/components/discourse-topic.js index c1b3d53d8f..d5daaca839 100644 --- a/app/assets/javascripts/discourse/app/components/discourse-topic.js +++ b/app/assets/javascripts/discourse/app/components/discourse-topic.js @@ -95,7 +95,7 @@ export default Component.extend( didInsertElement() { this._super(...arguments); - this.bindScrolling({ name: "topic-view" }); + this.bindScrolling(); window.addEventListener("resize", this.scrolled); $(this.element).on( "click.discourse-redirect", @@ -110,7 +110,7 @@ export default Component.extend( willDestroyElement() { this._super(...arguments); - this.unbindScrolling("topic-view"); + this.unbindScrolling(); window.removeEventListener("resize", this.scrolled); // Unbind link tracking diff --git a/app/assets/javascripts/discourse/app/components/footer-nav.js b/app/assets/javascripts/discourse/app/components/footer-nav.js index 449ab625e4..5df81b7bc7 100644 --- a/app/assets/javascripts/discourse/app/components/footer-nav.js +++ b/app/assets/javascripts/discourse/app/components/footer-nav.js @@ -40,7 +40,7 @@ const FooterNavComponent = MountWidget.extend( if (this.capabilities.isIpadOS) { document.body.classList.add("footer-nav-ipad"); } else { - this.bindScrolling({ name: "footer-nav" }); + this.bindScrolling(); window.addEventListener("resize", this.scrolled, false); this.appEvents.on("composer:opened", this, "_composerOpened"); this.appEvents.on("composer:closed", this, "_composerClosed"); @@ -60,7 +60,7 @@ const FooterNavComponent = MountWidget.extend( if (this.capabilities.isIpadOS) { document.body.classList.remove("footer-nav-ipad"); } else { - this.unbindScrolling("footer-nav"); + this.unbindScrolling(); window.removeEventListener("resize", this.scrolled); this.appEvents.off("composer:opened", this, "_composerOpened"); this.appEvents.off("composer:closed", this, "_composerClosed"); diff --git a/app/assets/javascripts/discourse/app/components/scroll-tracker.js b/app/assets/javascripts/discourse/app/components/scroll-tracker.js index 228a50d1a2..9e961b2892 100644 --- a/app/assets/javascripts/discourse/app/components/scroll-tracker.js +++ b/app/assets/javascripts/discourse/app/components/scroll-tracker.js @@ -12,7 +12,7 @@ export default Component.extend(Scrolling, { didInsertElement() { this._super(...arguments); - this.bindScrolling({ name: this.name }); + this.bindScrolling(); }, didRender() { @@ -27,7 +27,7 @@ export default Component.extend(Scrolling, { willDestroyElement() { this._super(...arguments); - this.unbindScrolling(this.name); + this.unbindScrolling(); }, scrolled() { diff --git a/app/assets/javascripts/discourse/app/components/user-stream.js b/app/assets/javascripts/discourse/app/components/user-stream.js index 71cc51166e..6e45c375c7 100644 --- a/app/assets/javascripts/discourse/app/components/user-stream.js +++ b/app/assets/javascripts/discourse/app/components/user-stream.js @@ -37,8 +37,6 @@ export default Component.extend(LoadMore, { }, _inserted: on("didInsertElement", function () { - this.bindScrolling({ name: "user-stream-view" }); - $(window).on("resize.discourse-on-scroll", () => this.scrolled()); $(this.element).on( @@ -54,7 +52,6 @@ export default Component.extend(LoadMore, { // This view is being removed. Shut down operations _destroyed: on("willDestroyElement", function () { - this.unbindScrolling("user-stream-view"); $(window).unbind("resize.discourse-on-scroll"); $(this.element).off("click.details-disabled", "details.disabled"); diff --git a/app/assets/javascripts/discourse/app/mixins/scrolling.js b/app/assets/javascripts/discourse/app/mixins/scrolling.js index 2f0a588e21..ced98a406f 100644 --- a/app/assets/javascripts/discourse/app/mixins/scrolling.js +++ b/app/assets/javascripts/discourse/app/mixins/scrolling.js @@ -1,6 +1,5 @@ import Mixin from "@ember/object/mixin"; -import discourseDebounce from "discourse-common/lib/debounce"; -import { scheduleOnce } from "@ember/runloop"; +import { scheduleOnce, throttle } from "@ember/runloop"; import { inject as service } from "@ember/service"; /** @@ -9,20 +8,18 @@ import { inject as service } from "@ember/service"; easier. **/ const ScrollingDOMMethods = { - bindOnScroll(onScrollMethod, name) { - name = name || "default"; - $(document).bind(`touchmove.discourse-${name}`, onScrollMethod); - $(window).bind(`scroll.discourse-${name}`, onScrollMethod); + bindOnScroll(onScrollMethod) { + document.addEventListener("touchmove", onScrollMethod, { passive: true }); + window.addEventListener("scroll", onScrollMethod, { passive: true }); }, - unbindOnScroll(name) { - name = name || "default"; - $(window).unbind(`scroll.discourse-${name}`); - $(document).unbind(`touchmove.discourse-${name}`); + unbindOnScroll(onScrollMethod) { + document.removeEventListener("touchmove", onScrollMethod); + window.removeEventListener("scroll", onScrollMethod); }, screenNotFull() { - return $(window).height() > $("#main").height(); + return window.height > document.querySelector("#main").offsetHeight; }, }; @@ -30,14 +27,15 @@ const Scrolling = Mixin.create({ router: service(), // Begin watching for scroll events. By default they will be called at max every 100ms. - // call with {debounce: N} for a diff time - bindScrolling(opts) { - opts = opts || { debounce: 100 }; - + // call with {throttle: N} to change the throttle spacing + bindScrolling(opts = {}) { + if (!opts.throttle) { + opts.throttle = 100; + } // So we can not call the scrolled event while transitioning. There is no public API for this :'( const microLib = this.router._router._routerMicrolib; - let onScrollMethod = () => { + let scheduleScrolled = () => { if (microLib.activeTransition) { return; } @@ -45,20 +43,22 @@ const Scrolling = Mixin.create({ return scheduleOnce("afterRender", this, "scrolled"); }; - if (opts.debounce) { - let debouncedScrollMethod = () => { - discourseDebounce(this, onScrollMethod, opts.debounce); - }; - ScrollingDOMMethods.bindOnScroll(debouncedScrollMethod, opts.name); + let onScrollMethod; + if (opts.throttle) { + onScrollMethod = () => + throttle(this, scheduleScrolled, opts.throttle, false); } else { - ScrollingDOMMethods.bindOnScroll(onScrollMethod, opts.name); + onScrollMethod = scheduleScrolled; } + + this._scrollingMixinOnScrollMethod = onScrollMethod; + ScrollingDOMMethods.bindOnScroll(onScrollMethod); }, screenNotFull: () => ScrollingDOMMethods.screenNotFull(), - unbindScrolling(name) { - ScrollingDOMMethods.unbindOnScroll(name); + unbindScrolling() { + ScrollingDOMMethods.unbindOnScroll(this._scrollingMixinOnScrollMethod); }, }); From 136189508b9a742e6b50e977d3a8677bc462d486 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sat, 27 Nov 2021 17:04:31 +0000 Subject: [PATCH 123/168] DEV: Ensure scrolling-post-stream event listeners are removed correctly (#15115) The method was switched from _debouncedScrollCallback to _debouncedScroll in ff72522f, but the cleanup was not updated to match. --- .../discourse/app/components/scrolling-post-stream.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js b/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js index c634f0336e..98ff4d775f 100644 --- a/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js +++ b/app/assets/javascripts/discourse/app/components/scrolling-post-stream.js @@ -365,8 +365,8 @@ export default MountWidget.extend({ willDestroyElement() { this._super(...arguments); - document.removeEventListener("touchmove", this._debouncedScrollCallback); - window.removeEventListener("scroll", this._debouncedScrollCallback); + document.removeEventListener("touchmove", this._debouncedScroll); + window.removeEventListener("scroll", this._debouncedScroll); this.appEvents.off("post-stream:refresh", this, "_debouncedScroll"); $(this.element).off("mouseenter.post-stream"); $(this.element).off("mouseleave.post-stream"); From bca5c58c909d6fa177e3724fef362a369e6f2b97 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sun, 28 Nov 2021 10:42:59 +0000 Subject: [PATCH 124/168] DEV: Disable 'passive' handlers for pan-events mixin (#15118) These were set to `passive: true` in ff72522f. However, two consumers of this mixin (topic-navigation and site-header) do need to call `e.preventDefault()`, so we can't use passive listeners here. That's ok, because this mixin only applies to a specific component's element, not the entire page. So having these non-passive listeners doesn't affect the vast majority of scrolling --- app/assets/javascripts/discourse/app/mixins/pan-events.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/mixins/pan-events.js b/app/assets/javascripts/discourse/app/mixins/pan-events.js index 63db26161a..35d03d1903 100644 --- a/app/assets/javascripts/discourse/app/mixins/pan-events.js +++ b/app/assets/javascripts/discourse/app/mixins/pan-events.js @@ -34,7 +34,7 @@ export default Mixin.create({ this.touchCancel = (e) => this._panMove({ type: "pointercancel" }, e); const opts = { - passive: true, + passive: false, }; element.addEventListener("touchstart", this.touchStart, opts); element.addEventListener("touchmove", this.touchMove, opts); From 1b9cf1b1c7c682e072445a7b75bfe755c2b1688a Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sun, 28 Nov 2021 10:47:44 +0000 Subject: [PATCH 125/168] PERF: Update widget hooks to avoid global scroll-blocking events (#15116) For widget event handlers, we register a single listener on the ``, and then notify the relavent widget (if any) when the event fires. `touchstart` and `touchmove` events are particularly performance sensitive because they block scrolling on mobile. Therefore we want to avoid registering global non-passive listeners for these events. This commit updates the WidgetTouchStartHook and WidgetDragHook implementations to automatically register listeners on the specific widget DOM elements when required. This commit removes the last global scroll-blocking event handler from Discourse core. That means that mobile scrolling is now completely decoupled from our JS app. Even if the JS app is completely blocked (e.g. during rendering), scrolling will now continue to work. This should make things feel a lot smoother, especially on lower performance devices. --- .../discourse/app/widgets/hooks.js | 164 ++++++++++-------- 1 file changed, 90 insertions(+), 74 deletions(-) diff --git a/app/assets/javascripts/discourse/app/widgets/hooks.js b/app/assets/javascripts/discourse/app/widgets/hooks.js index fe6457e4f8..9bc6ea72b9 100644 --- a/app/assets/javascripts/discourse/app/widgets/hooks.js +++ b/app/assets/javascripts/discourse/app/widgets/hooks.js @@ -1,4 +1,5 @@ /*eslint no-loop-func:0*/ +import { bind } from "discourse-common/utils/decorators"; const CLICK_ATTRIBUTE_NAME = "_discourse_click_widget"; const DOUBLE_CLICK_ATTRIBUTE_NAME = "_discourse_double_click_widget"; @@ -7,7 +8,6 @@ const MOUSE_DOWN_OUTSIDE_ATTRIBUTE_NAME = "_discourse_mouse_down_outside_widget"; const KEY_UP_ATTRIBUTE_NAME = "_discourse_key_up_widget"; const KEY_DOWN_ATTRIBUTE_NAME = "_discourse_key_down_widget"; -const DRAG_ATTRIBUTE_NAME = "_discourse_drag_widget"; const INPUT_ATTRIBUTE_NAME = "_discourse_input_widget"; const CHANGE_ATTRIBUTE_NAME = "_discourse_change_widget"; const MOUSE_DOWN_ATTRIBUTE_NAME = "_discourse_mouse_down_widget"; @@ -15,15 +15,16 @@ const MOUSE_UP_ATTRIBUTE_NAME = "_discourse_mouse_up_widget"; const MOUSE_MOVE_ATTRIBUTE_NAME = "_discourse_mouse_move_widget"; const MOUSE_OVER_ATTRIBUTE_NAME = "_discourse_mouse_over_widget"; const MOUSE_OUT_ATTRIBUTE_NAME = "_discourse_mouse_out_widget"; -const TOUCH_START_ATTRIBUTE_NAME = "_discourse_touch_start_widget"; const TOUCH_END_ATTRIBUTE_NAME = "_discourse_touch_end_widget"; -function buildHook(attributeName, setAttr) { - return class { - constructor(widget) { - this.widget = widget; - } +class WidgetBaseHook { + constructor(widget) { + this.widget = widget; + } +} +function buildHook(attributeName, setAttr) { + return class extends WidgetBaseHook { hook(node) { if (setAttr) { node.setAttribute(setAttr, true); @@ -40,6 +41,8 @@ function buildHook(attributeName, setAttr) { }; } +// For the majority of events, we register a single listener on the ``, and then +// notify the relavent widget (if any) when the event fires (see setupDocumentCallback() below) export const WidgetClickHook = buildHook(CLICK_ATTRIBUTE_NAME); export const WidgetDoubleClickHook = buildHook(DOUBLE_CLICK_ATTRIBUTE_NAME); export const WidgetClickOutsideHook = buildHook( @@ -52,7 +55,6 @@ export const WidgetMouseDownOutsideHook = buildHook( ); export const WidgetKeyUpHook = buildHook(KEY_UP_ATTRIBUTE_NAME); export const WidgetKeyDownHook = buildHook(KEY_DOWN_ATTRIBUTE_NAME); -export const WidgetDragHook = buildHook(DRAG_ATTRIBUTE_NAME); export const WidgetInputHook = buildHook(INPUT_ATTRIBUTE_NAME); export const WidgetChangeHook = buildHook(CHANGE_ATTRIBUTE_NAME); export const WidgetMouseUpHook = buildHook(MOUSE_UP_ATTRIBUTE_NAME); @@ -60,9 +62,88 @@ export const WidgetMouseDownHook = buildHook(MOUSE_DOWN_ATTRIBUTE_NAME); export const WidgetMouseMoveHook = buildHook(MOUSE_MOVE_ATTRIBUTE_NAME); export const WidgetMouseOverHook = buildHook(MOUSE_OVER_ATTRIBUTE_NAME); export const WidgetMouseOutHook = buildHook(MOUSE_OUT_ATTRIBUTE_NAME); -export const WidgetTouchStartHook = buildHook(TOUCH_START_ATTRIBUTE_NAME); export const WidgetTouchEndHook = buildHook(TOUCH_END_ATTRIBUTE_NAME); +// `touchstart` and `touchmove` events are particularly performance sensitive because +// they block scrolling on mobile. Therefore we want to avoid registering global non-passive +// listeners for these events. +// Instead, the WidgetTouchStartHook and WidgetDragHook automatically register listeners on +// the specific widget DOM elements when required. +export class WidgetTouchStartHook extends WidgetBaseHook { + hook(node, propertyName, previousValue) { + if (!previousValue) { + // Adding to DOM + node.addEventListener("touchstart", this.callback, { passive: false }); + } + } + + unhook(node, propertyName, newValue) { + if (!newValue) { + node.removeEventListener("touchstart", this.callback); + } + } + + @bind + callback(e) { + this.widget.touchStart(e); + } +} + +let _currentlyDraggingHook; +export class WidgetDragHook extends WidgetBaseHook { + hook(node, propertyName, previousValue) { + if (!previousValue) { + // Adding to DOM + node.addEventListener("touchstart", this.startDrag, { passive: false }); + node.addEventListener("mousedown", this.startDrag, { passive: false }); + } + } + + unhook(node, propertyName, newValue) { + if (!newValue) { + // Removing from DOM + node.removeEventListener("touchstart", this.startDrag); + node.removeEventListener("mousedown", this.startDrag); + } + } + + @bind + startDrag(e) { + e.preventDefault(); + e.stopPropagation(); + _currentlyDraggingHook?.dragEnd(); + _currentlyDraggingHook = this; + document.body.classList.add("widget-dragging"); + document.addEventListener("touchmove", this.drag, { passive: false }); + document.addEventListener("mousemove", this.drag, { passive: false }); + document.addEventListener("touchend", this.dragEnd); + document.addEventListener("mouseup", this.dragEnd); + } + + @bind + drag(e) { + if (event.type === "mousemove") { + this.widget.drag(e); + } else { + const tt = e.targetTouches[0]; + e.preventDefault(); + e.stopPropagation(); + this.widget.drag(tt); + } + } + + @bind + dragEnd(e) { + document.body.classList.remove("widget-dragging"); + document.removeEventListener("touchmove", this.drag); + document.removeEventListener("mousemove", this.drag); + document.removeEventListener("touchend", this.dragEnd); + document.removeEventListener("mouseup", this.dragEnd); + this.widget.dragEnd(e); + _currentlyDraggingHook = null; + } +} + function nodeCallback(node, attrName, cb, options = { rerender: true }) { const { rerender } = options; const widget = findWidget(node, attrName); @@ -87,39 +168,12 @@ function findWidget(node, attrName) { } let _watchingDocument = false; -let _dragging; - -const DRAG_NAME = "mousemove.discourse-widget-drag"; - -function cancelDrag(e) { - $("body").removeClass("widget-dragging"); - $(document).off(DRAG_NAME); - - // We leave the touchmove event cause touch needs it always bound on iOS - - if (_dragging) { - if (_dragging.dragEnd) { - _dragging.dragEnd(e); - } - _dragging = null; - } -} WidgetClickHook.setupDocumentCallback = function () { if (_watchingDocument) { return; } - let widget; - let onDrag = (dragE) => { - const tt = dragE.targetTouches[0]; - if (tt && widget) { - dragE.preventDefault(); - dragE.stopPropagation(); - widget.drag(tt); - } - }; - $(document).on("mouseover.discourse-widget", (e) => { nodeCallback(e.target, MOUSE_OVER_ATTRIBUTE_NAME, (w) => w.mouseOver(e), { rerender: false, @@ -132,38 +186,6 @@ WidgetClickHook.setupDocumentCallback = function () { }); }); - document.addEventListener("touchmove", onDrag, { - passive: false, - capture: true, - }); - - $(document).on( - "mousedown.discource-widget-drag, touchstart.discourse-widget-drag", - (e) => { - cancelDrag(e); - widget = findWidget(e.target, DRAG_ATTRIBUTE_NAME); - if (widget) { - e.preventDefault(); - e.stopPropagation(); - _dragging = widget; - $("body").addClass("widget-dragging"); - $(document).on(DRAG_NAME, (dragE) => { - if (widget) { - widget.drag(dragE); - } - }); - } - } - ); - - $(document).on( - "mouseup.discourse-widget-drag, touchend.discourse-widget-drag", - (e) => { - widget = null; - cancelDrag(e); - } - ); - $(document).on("dblclick.discourse-widget", (e) => { nodeCallback(e.target, DOUBLE_CLICK_ATTRIBUTE_NAME, (w) => w.doubleClick(e) @@ -224,12 +246,6 @@ WidgetClickHook.setupDocumentCallback = function () { }); }); - $(document).on("touchstart.discourse-widget", (e) => { - nodeCallback(e.target, TOUCH_START_ATTRIBUTE_NAME, (w) => w.touchStart(e), { - rerender: false, - }); - }); - $(document).on("touchend.discourse-widget", (e) => { nodeCallback(e.target, TOUCH_END_ATTRIBUTE_NAME, (w) => w.touchEnd(e), { rerender: false, From fb5e871dff3da8131d717ec3f6edb27527ad0314 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Sun, 28 Nov 2021 12:45:32 +0100 Subject: [PATCH 126/168] DEV: Remove unnecessary functions (#15113) --- app/assets/javascripts/discourse/app/lib/eyeline.js | 4 ---- app/assets/javascripts/discourse/app/routes/application.js | 5 ----- 2 files changed, 9 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/eyeline.js b/app/assets/javascripts/discourse/app/lib/eyeline.js index 76757e2e20..10d40b1187 100644 --- a/app/assets/javascripts/discourse/app/lib/eyeline.js +++ b/app/assets/javascripts/discourse/app/lib/eyeline.js @@ -19,10 +19,6 @@ configureEyeline(); // Track visible elements on the screen. export default EmberObject.extend(Evented, { - init() { - this._super(...arguments); - }, - update() { if (_skipUpdate) { return; diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js index 9ffcb3987f..dbffdf2de9 100644 --- a/app/assets/javascripts/discourse/app/routes/application.js +++ b/app/assets/javascripts/discourse/app/routes/application.js @@ -58,11 +58,6 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, { this.documentTitle.setTitle(tokens.join(" - ")); }, - // We need an empty method here for Ember to fire the action properly on all routes. - willTransition() { - this._super(...arguments); - }, - postWasEnqueued(details) { showModal("post-enqueued", { model: details, From f1b926ed3bee3c45aeaa5acc6c44dd198e95196d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Nov 2021 22:23:39 +0100 Subject: [PATCH 127/168] Build(deps): Bump globalid from 0.6.0 to 1.0.0 (#15122) Bumps [globalid](https://github.com/rails/globalid) from 0.6.0 to 1.0.0. - [Release notes](https://github.com/rails/globalid/releases) - [Commits](https://github.com/rails/globalid/compare/v0.6.0...v1.0.0) --- updated-dependencies: - dependency-name: globalid dependency-type: indirect update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f8d1d18193..38f15a1fb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -161,7 +161,7 @@ GEM ffi (1.15.4) fspath (3.1.2) gc_tracer (1.5.1) - globalid (0.6.0) + globalid (1.0.0) activesupport (>= 5.0) guess_html_encoding (0.0.11) hana (1.3.7) From 7c572d0472f018205f1d9544cbdaa26605d0a49d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Nov 2021 22:29:40 +0100 Subject: [PATCH 128/168] Build(deps): Bump logster from 2.9.8 to 2.10.0 (#15121) Bumps [logster](https://github.com/discourse/logster) from 2.9.8 to 2.10.0. - [Release notes](https://github.com/discourse/logster/releases) - [Changelog](https://github.com/discourse/logster/blob/main/CHANGELOG.md) - [Commits](https://github.com/discourse/logster/compare/v2.9.8...v2.10.0) --- updated-dependencies: - dependency-name: logster dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 38f15a1fb2..cfd279d729 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,7 +214,7 @@ GEM logstash-event (1.2.02) logstash-logger (0.26.1) logstash-event (~> 1.2) - logster (2.9.8) + logster (2.10.0) loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) From e46495833309d010544ae98ca4ab4c2d24c84713 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Mon, 29 Nov 2021 08:32:06 +1000 Subject: [PATCH 129/168] DEV: Fix uploadHandler impl. in composer-upload-uppy mixin (#15105) In f6528afa019ded81012947efdf2835324488183b I added parity support for composer upload handlers to the uppy-ized composer. However the way I assumed that it was only possible to handle a single file upload at a time was false; it only appeared this way in the old jQuery file upload composer because jQuery file upload sent through files one at a time even if multiple were added at once. This caused issues in certain plugins and themes by third parties. This commit fixes the issue by making the uppy upload handler work the same as the old one, by capturing all of the added files that have matching handlers then going through them one by one and passing them to the handler function. --- .../app/mixins/composer-upload-uppy.js | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js index 316518f9de..a79b742a71 100644 --- a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js +++ b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js @@ -140,24 +140,36 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { }, onBeforeUpload: (files) => { - const fileCount = Object.keys(files).length; const maxFiles = this.siteSettings.simultaneous_uploads; // Look for a matching file upload handler contributed from a plugin. - // It is not ideal that this only works for single file uploads, but - // at this time it is all we need. In future we may want to devise a - // nicer way of doing this. Uppy plugins are out of the question because - // there is no way to define which uploader plugin handles which file - // extensions at this time. - if (fileCount === 1) { - const file = Object.values(files)[0]; + // In future we may want to devise a nicer way of doing this. + // Uppy plugins are out of the question because there is no way to + // define which uploader plugin handles which file extensions at this time. + const uploadHandlerFiles = []; + const unhandledFiles = {}; + for (const [fileId, file] of Object.entries(files)) { const matchingHandler = this._findMatchingUploadHandler(file.name); - if (matchingHandler && !matchingHandler.method(file.data, this)) { - return this._abortAndReset(); + if (matchingHandler) { + uploadHandlerFiles.push([file, matchingHandler]); + } else { + unhandledFiles[fileId] = { ...files[fileId] }; } } - // Limit the number of simultaneous uploads + // This replicates what the old composer upload handler did; because + // jQuery file uploader passed through a single file at a time to + // the upload handlers. + uploadHandlerFiles.forEach((fileWithHandler) => { + const [file, matchingHandler] = fileWithHandler; + if (matchingHandler && !matchingHandler.method(file.data, this)) { + return this._abortAndReset(); + } + }); + + // Limit the number of simultaneous uploads, for files which have + // _not_ been handled by an upload handler. + const fileCount = Object.keys(unhandledFiles).length; if (maxFiles > 0 && fileCount > maxFiles) { bootbox.alert( I18n.t("post.errors.too_many_dragged_and_dropped_files", { @@ -166,6 +178,9 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { ); return this._abortAndReset(); } + + // uppy uses this new object to track progress of remaining files + return unhandledFiles; }, }); @@ -196,14 +211,14 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { }); this._uppyInstance.on("file-removed", (file, reason) => { - file.meta.cancelled = true; - // we handle the cancel-all event specifically, so no need - // to do anything here + // to do anything here. this event is also fired when some files + // are handled by an upload handler if (reason === "cancel-all") { return; } + file.meta.cancelled = true; this._removeInProgressUpload(file.id); this._resetUpload(file, { removePlaceholder: true }); if (this.inProgressUploads.length === 0) { From 13aed6fe3b027ba68ee7fefef7637c4e10dcd51b Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Sun, 28 Nov 2021 23:34:51 +0100 Subject: [PATCH 130/168] FIX: Setting bookmarks in some cases was broken (#15120) Error introduced in #14781 ``` Error: Assertion Failed: You attempted to update <(unknown):ember3217>.bookmarks to "<(unknown):ember3846>", but it is being tracked by a tracking context, such as a template, computed property, or observer. In order to make sure the context updates properly, you must invalidate the property when updating it. You can mark the property as `@tracked`, or use `@ember/object#set` to do this. ``` --- app/assets/javascripts/discourse/app/models/topic.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js index d5ed11eb76..bc0497d89e 100644 --- a/app/assets/javascripts/discourse/app/models/topic.js +++ b/app/assets/javascripts/discourse/app/models/topic.js @@ -493,7 +493,10 @@ const Topic = RestModel.extend({ keys.forEach((key) => this.set(key, json[key])); if (this.bookmarks.length) { - this.bookmarks = this.bookmarks.map((bm) => Bookmark.create(bm)); + this.set( + "bookmarks", + this.bookmarks.map((bm) => Bookmark.create(bm)) + ); } return this; From 20b2a42f491c2633323a4db0c5b43c5b2f31324b Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Mon, 29 Nov 2021 11:19:02 +1000 Subject: [PATCH 131/168] DEV: Send multiple files in batches to composer upload handlers when using uppy (#15124) In jQuery file upload land, we were sending a single file through at a time to matching upload handlers. This in turn required plugin authors to marshal the files as they came through one by one if they wanted to group them together to do something with them. Now that we are using uppy, files come through in the groups they are added in (for example dropping multiple, selecting multiple from the system file dialogue). This commit changes the matching upload handlers to send through all matching files at once instead of piecemeal. --- .../app/mixins/composer-upload-uppy.js | 27 ++++++++++++------- .../acceptance/composer-uploads-uppy-test.js | 3 ++- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js index a79b742a71..c623a92388 100644 --- a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js +++ b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js @@ -146,26 +146,35 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { // In future we may want to devise a nicer way of doing this. // Uppy plugins are out of the question because there is no way to // define which uploader plugin handles which file extensions at this time. - const uploadHandlerFiles = []; const unhandledFiles = {}; + const handlerBuckets = {}; + for (const [fileId, file] of Object.entries(files)) { const matchingHandler = this._findMatchingUploadHandler(file.name); if (matchingHandler) { - uploadHandlerFiles.push([file, matchingHandler]); + // the function signature will be converted to a string for the + // object key, so we can send multiple files at once to each handler + if (handlerBuckets[matchingHandler.method]) { + handlerBuckets[matchingHandler.method].files.push(file); + } else { + handlerBuckets[matchingHandler.method] = { + fn: matchingHandler.method, + files: [file], + }; + } } else { unhandledFiles[fileId] = { ...files[fileId] }; } } - // This replicates what the old composer upload handler did; because - // jQuery file uploader passed through a single file at a time to - // the upload handlers. - uploadHandlerFiles.forEach((fileWithHandler) => { - const [file, matchingHandler] = fileWithHandler; - if (matchingHandler && !matchingHandler.method(file.data, this)) { + // Send the collected array of files to each matching handler, + // rather than the old jQuery file uploader method of sending + // a single file at a time through to the handler. + for (const bucket of Object.values(handlerBuckets)) { + if (!bucket.fn(bucket.files, this)) { return this._abortAndReset(); } - }); + } // Limit the number of simultaneous uploads, for files which have // _not_ been handled by an upload handler. diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js index d0a0847c71..6671bc8a92 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js @@ -234,7 +234,8 @@ acceptance("Uppy Composer Attachment - Upload Handler", function (needs) { }); needs.hooks.beforeEach(() => { withPluginApi("0.8.14", (api) => { - api.addComposerUploadHandler(["png"], (file) => { + api.addComposerUploadHandler(["png"], (files) => { + const file = files[0]; bootbox.alert(`This is an upload handler test for ${file.name}`); }); }); From 5d643a498eda5f45c7c647f1575418f0bc12310f Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 29 Nov 2021 07:13:35 +0100 Subject: [PATCH 132/168] FIX: Global log notice regressed in #15000 (#15119) Notice models didn't have the same injections as GlobalNotice components. --- .../javascripts/discourse/app/components/global-notice.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/discourse/app/components/global-notice.js b/app/assets/javascripts/discourse/app/components/global-notice.js index c526bebef2..d37c3c0b82 100644 --- a/app/assets/javascripts/discourse/app/components/global-notice.js +++ b/app/assets/javascripts/discourse/app/components/global-notice.js @@ -16,6 +16,8 @@ export function addGlobalNotice(text, id, options = {}) { const GLOBAL_NOTICE_DISMISSED_PROMPT_KEY = "dismissed-global-notice-v2"; const Notice = EmberObject.extend({ + logsNoticeService: service("logsNotice"), + text: null, id: null, options: null, From 530eb0c9bd814c9a96382c12b972078ac25194e3 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 29 Nov 2021 07:36:48 +0100 Subject: [PATCH 133/168] DEV: Throw on non-xhr errors (#15123) Makes it easier to debug post-stream problems when the issue isn't with the server response. --- .../javascripts/discourse/app/models/post-stream.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/app/models/post-stream.js b/app/assets/javascripts/discourse/app/models/post-stream.js index c2b64b3579..9eeffd6c08 100644 --- a/app/assets/javascripts/discourse/app/models/post-stream.js +++ b/app/assets/javascripts/discourse/app/models/post-stream.js @@ -1215,17 +1215,21 @@ export default RestModel.extend({ // Handles an error loading a topic based on a HTTP status code. Updates // the text to the correct values. - errorLoading(result) { + errorLoading(error) { const topic = this.topic; this.set("loadingFilter", false); topic.set("errorLoading", true); - const json = result.jqXHR.responseJSON; + if (!error.jqXHR) { + throw error; + } + + const json = error.jqXHR.responseJSON; if (json && json.extras && json.extras.html) { topic.set("errorHtml", json.extras.html); } else { topic.set("errorMessage", I18n.t("topic.server_error.description")); - topic.set("noRetry", result.jqXHR.status === 403); + topic.set("noRetry", error.jqXHR.status === 403); } }, From 6e603799eb16b95e897770ef422c2842ccd9ab7c Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 29 Nov 2021 07:40:01 +0100 Subject: [PATCH 134/168] FIX: treats ipad as mobileView for popper positioning (#15091) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * FIX: treats ipad as mobileView for popper positioning * ensures it doesn’t break wizard --- .../javascripts/select-kit/addon/components/select-kit.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js index e115ee9b2b..a32e864b33 100644 --- a/app/assets/javascripts/select-kit/addon/components/select-kit.js +++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js @@ -861,7 +861,10 @@ export default Component.extend( `#${this.selectKit.uniqueID}-body` ); - const placementStrategy = this?.site?.mobileView ? "absolute" : "fixed"; + const placementStrategy = + this.capabilities?.isIpadOS || this.site?.mobileView + ? "absolute" + : "fixed"; const verticalOffset = 3; this.popper = createPopper(anchor, popper, { From a5fbb90df45205d24b7659f80bdf241389b40eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= Date: Thu, 26 Aug 2021 18:16:00 +0200 Subject: [PATCH 135/168] =?UTF-8?q?FEATURE:=20Display=20pending=20posts=20?= =?UTF-8?q?on=20user=E2=80=99s=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently when a user creates posts that are moderated (for whatever reason), a popup is displayed saying the post needs approval and the total number of the user’s pending posts. But then this piece of information is kind of lost and there is nowhere for the user to know what are their pending posts or how many there are. This patch solves this issue by adding a new “Pending” section to the user’s activity page when there are some pending posts to display. When there are none, then the “Pending” section isn’t displayed at all. --- .../addon/utils/category-macro.js | 8 ++ .../discourse/app/adapters/pending-post.js | 9 ++ .../discourse/app/components/pending-post.js | 29 ++++++ .../app/controllers/user-activity.js | 7 ++ .../discourse/app/models/bookmark.js | 7 +- .../discourse/app/models/pending-post.js | 28 ++++++ .../discourse/app/models/reviewable.js | 7 +- .../javascripts/discourse/app/models/topic.js | 7 +- .../discourse/app/models/user-action.js | 13 +-- .../app/routes/user-activity-pending.js | 38 +++++++- .../javascripts/discourse/app/routes/user.js | 10 ++ .../app/templates/components/empty-state.hbs | 6 ++ .../app/templates/components/pending-post.hbs | 1 + .../app/templates/user-activity/pending.hbs | 5 + .../app/templates/user-topics-list.hbs | 10 +- .../discourse/app/templates/user/activity.hbs | 6 ++ .../app/templates/user/bookmarks.hbs | 10 +- .../templates/user/notifications-index.hbs | 10 +- .../discourse/app/templates/user/stream.hbs | 10 +- app/assets/javascripts/discourse/package.json | 3 +- .../tests/acceptance/pending-posts-test.js | 31 ++++++ .../discourse/tests/fixtures/pending-posts.js | 32 +++++++ .../components/empty-state-test.js | 23 +++++ .../components/pending-post-test.js | 37 ++++++++ .../discourse/tests/test-helper.js | 3 + .../tests/unit/models/pending-post-test.js | 36 +++++++ app/assets/javascripts/yarn.lock | 11 ++- app/controllers/posts_controller.rb | 8 ++ app/models/reviewable_queued_post.rb | 12 +++ app/models/user.rb | 1 + app/models/user_stat.rb | 14 ++- app/serializers/current_user_serializer.rb | 18 +--- app/serializers/pending_post_serializer.rb | 27 ++++++ app/serializers/user_card_serializer.rb | 10 +- app/serializers/web_hook_user_serializer.rb | 1 + config/locales/client.en.yml | 3 + config/routes.rb | 1 + ...8_add_pending_posts_count_to_user_stats.rb | 7 ++ ...356_populate_pending_posts_count_column.rb | 22 +++++ lib/guardian.rb | 8 +- package.json | 1 + spec/models/reviewable_queued_post_spec.rb | 32 +++++++ spec/models/user_spec.rb | 2 + spec/models/user_stat_spec.rb | 23 +++++ .../api/schemas/json/user_get_response.json | 3 + spec/requests/posts_controller_spec.rb | 95 +++++++++++++++++++ .../current_user_serializer_spec.rb | 68 +++++++------ .../pending_post_serializer_spec.rb | 59 ++++++++++++ spec/serializers/user_card_serializer_spec.rb | 35 +++++++ 49 files changed, 737 insertions(+), 110 deletions(-) create mode 100644 app/assets/javascripts/discourse-common/addon/utils/category-macro.js create mode 100644 app/assets/javascripts/discourse/app/adapters/pending-post.js create mode 100644 app/assets/javascripts/discourse/app/components/pending-post.js create mode 100644 app/assets/javascripts/discourse/app/models/pending-post.js create mode 100644 app/assets/javascripts/discourse/app/templates/components/empty-state.hbs create mode 100644 app/assets/javascripts/discourse/app/templates/components/pending-post.hbs create mode 100644 app/assets/javascripts/discourse/app/templates/user-activity/pending.hbs create mode 100644 app/assets/javascripts/discourse/tests/acceptance/pending-posts-test.js create mode 100644 app/assets/javascripts/discourse/tests/fixtures/pending-posts.js create mode 100644 app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js create mode 100644 app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js create mode 100644 app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js create mode 100644 app/serializers/pending_post_serializer.rb create mode 100644 db/migrate/20210915142958_add_pending_posts_count_to_user_stats.rb create mode 100644 db/post_migrate/20211019152356_populate_pending_posts_count_column.rb create mode 100644 spec/serializers/pending_post_serializer_spec.rb diff --git a/app/assets/javascripts/discourse-common/addon/utils/category-macro.js b/app/assets/javascripts/discourse-common/addon/utils/category-macro.js new file mode 100644 index 0000000000..625cbde74d --- /dev/null +++ b/app/assets/javascripts/discourse-common/addon/utils/category-macro.js @@ -0,0 +1,8 @@ +import Category from "discourse/models/category"; +import { computed, get } from "@ember/object"; + +export default function categoryFromId(property) { + return computed(property, function () { + return Category.findById(get(this, property)); + }); +} diff --git a/app/assets/javascripts/discourse/app/adapters/pending-post.js b/app/assets/javascripts/discourse/app/adapters/pending-post.js new file mode 100644 index 0000000000..13b086dd19 --- /dev/null +++ b/app/assets/javascripts/discourse/app/adapters/pending-post.js @@ -0,0 +1,9 @@ +import RestAdapter from "discourse/adapters/rest"; + +export default RestAdapter.extend({ + jsonMode: true, + + pathFor(_store, _type, params) { + return `/posts/${params.username}/pending.json`; + }, +}); diff --git a/app/assets/javascripts/discourse/app/components/pending-post.js b/app/assets/javascripts/discourse/app/components/pending-post.js new file mode 100644 index 0000000000..428ff0416c --- /dev/null +++ b/app/assets/javascripts/discourse/app/components/pending-post.js @@ -0,0 +1,29 @@ +import Component from "@ember/component"; +import { afterRender } from "discourse-common/utils/decorators"; +import { loadOneboxes } from "discourse/lib/load-oneboxes"; +import { ajax } from "discourse/lib/ajax"; +import { resolveAllShortUrls } from "pretty-text/upload-short-url"; + +export default Component.extend({ + didRender() { + this._loadOneboxes(); + this._resolveUrls(); + }, + + @afterRender + _loadOneboxes() { + loadOneboxes( + this.element, + ajax, + this.post.topic_id, + this.post.category_id, + this.siteSettings.max_oneboxes_per_post, + true + ); + }, + + @afterRender + _resolveUrls() { + resolveAllShortUrls(ajax, this.siteSettings, this.element, this.opts); + }, +}); diff --git a/app/assets/javascripts/discourse/app/controllers/user-activity.js b/app/assets/javascripts/discourse/app/controllers/user-activity.js index cb7277ea5c..3bfda75bda 100644 --- a/app/assets/javascripts/discourse/app/controllers/user-activity.js +++ b/app/assets/javascripts/discourse/app/controllers/user-activity.js @@ -35,6 +35,13 @@ export default Controller.extend({ : I18n.t("drafts.label"); }, + @discourseComputed("model.pending_posts_count") + pendingLabel(count) { + return count > 0 + ? I18n.t("pending_posts.label_with_count", { count }) + : I18n.t("pending_posts.label"); + }, + actions: { exportUserArchive() { bootbox.confirm( diff --git a/app/assets/javascripts/discourse/app/models/bookmark.js b/app/assets/javascripts/discourse/app/models/bookmark.js index 19c261afb3..bbe656d63b 100644 --- a/app/assets/javascripts/discourse/app/models/bookmark.js +++ b/app/assets/javascripts/discourse/app/models/bookmark.js @@ -1,4 +1,4 @@ -import Category from "discourse/models/category"; +import categoryFromId from "discourse-common/utils/category-macro"; import I18n from "I18n"; import { Promise } from "rsvp"; import RestModel from "discourse/models/rest"; @@ -119,10 +119,7 @@ const Bookmark = RestModel.extend({ return newTags; }, - @discourseComputed("category_id") - category(categoryId) { - return Category.findById(categoryId); - }, + category: categoryFromId("category_id"), @discourseComputed("reminder_at", "currentUser") formattedReminder(bookmarkReminderAt, currentUser) { diff --git a/app/assets/javascripts/discourse/app/models/pending-post.js b/app/assets/javascripts/discourse/app/models/pending-post.js new file mode 100644 index 0000000000..65f723a3f7 --- /dev/null +++ b/app/assets/javascripts/discourse/app/models/pending-post.js @@ -0,0 +1,28 @@ +import discourseComputed from "discourse-common/utils/decorators"; +import RestModel from "discourse/models/rest"; +import categoryFromId from "discourse-common/utils/category-macro"; +import { userPath } from "discourse/lib/url"; +import { reads } from "@ember/object/computed"; +import { cookAsync } from "discourse/lib/text"; + +const PendingPost = RestModel.extend({ + expandedExcerpt: null, + postUrl: reads("topic_url"), + truncated: false, + + init() { + this._super(...arguments); + cookAsync(this.raw_text).then((cooked) => { + this.set("expandedExcerpt", cooked); + }); + }, + + @discourseComputed("username") + userUrl(username) { + return userPath(username.toLowerCase()); + }, + + category: categoryFromId("category_id"), +}); + +export default PendingPost; diff --git a/app/assets/javascripts/discourse/app/models/reviewable.js b/app/assets/javascripts/discourse/app/models/reviewable.js index a0ad27937a..d991f40b92 100644 --- a/app/assets/javascripts/discourse/app/models/reviewable.js +++ b/app/assets/javascripts/discourse/app/models/reviewable.js @@ -1,4 +1,4 @@ -import Category from "discourse/models/category"; +import categoryFromId from "discourse-common/utils/category-macro"; import I18n from "I18n"; import { Promise } from "rsvp"; import RestModel from "discourse/models/rest"; @@ -24,10 +24,7 @@ const Reviewable = RestModel.extend({ }); }, - @discourseComputed("category_id") - category(categoryId) { - return Category.findById(categoryId); - }, + category: categoryFromId("category_id"), update(updates) { // If no changes, do nothing diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js index bc0497d89e..e17c723d29 100644 --- a/app/assets/javascripts/discourse/app/models/topic.js +++ b/app/assets/javascripts/discourse/app/models/topic.js @@ -1,7 +1,7 @@ import { alias, and, equal, notEmpty, or } from "@ember/object/computed"; import { fmt, propertyEqual } from "discourse/lib/computed"; import ActionSummary from "discourse/models/action-summary"; -import Category from "discourse/models/category"; +import categoryFromId from "discourse-common/utils/category-macro"; import Bookmark from "discourse/models/bookmark"; import EmberObject from "@ember/object"; import I18n from "I18n"; @@ -209,10 +209,7 @@ const Topic = RestModel.extend({ return { type: "topic", id }; }, - @discourseComputed("category_id") - category(categoryId) { - return Category.findById(categoryId); - }, + category: categoryFromId("category_id"), @discourseComputed("url") shareUrl(url) { diff --git a/app/assets/javascripts/discourse/app/models/user-action.js b/app/assets/javascripts/discourse/app/models/user-action.js index 2c3762c726..a1a567720e 100644 --- a/app/assets/javascripts/discourse/app/models/user-action.js +++ b/app/assets/javascripts/discourse/app/models/user-action.js @@ -1,6 +1,6 @@ import { and, equal, or } from "@ember/object/computed"; -import discourseComputed, { on } from "discourse-common/utils/decorators"; -import Category from "discourse/models/category"; +import discourseComputed from "discourse-common/utils/decorators"; +import categoryFromId from "discourse-common/utils/category-macro"; import RestModel from "discourse/models/rest"; import User from "discourse/models/user"; import UserActionGroup from "discourse/models/user-action-group"; @@ -19,7 +19,6 @@ const UserActionTypes = { edits: 11, messages_sent: 12, messages_received: 13, - pending: 14, }; const InvertedActionTypes = {}; @@ -28,13 +27,7 @@ Object.keys(UserActionTypes).forEach( ); const UserAction = RestModel.extend({ - @on("init") - _attachCategory() { - const categoryId = this.category_id; - if (categoryId) { - this.set("category", Category.findById(categoryId)); - } - }, + category: categoryFromId("category_id"), @discourseComputed("action_type") descriptionKey(action) { diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-pending.js b/app/assets/javascripts/discourse/app/routes/user-activity-pending.js index e5b5633164..d01768110f 100644 --- a/app/assets/javascripts/discourse/app/routes/user-activity-pending.js +++ b/app/assets/javascripts/discourse/app/routes/user-activity-pending.js @@ -1,6 +1,36 @@ -import UserAction from "discourse/models/user-action"; -import UserActivityStreamRoute from "discourse/routes/user-activity-stream"; +import DiscourseRoute from "discourse/routes/discourse"; -export default UserActivityStreamRoute.extend({ - userActionType: UserAction.TYPES.pending, +export default DiscourseRoute.extend({ + beforeModel() { + this.username = this.modelFor("user").username_lower; + }, + + model() { + return this.store.findAll("pending-post", { + username: this.username, + }); + }, + + activate() { + this.appEvents.on( + `count-updated:${this.username}:pending_posts_count`, + this, + "_handleCountChange" + ); + }, + + deactivate() { + this.appEvents.off( + `count-updated:${this.username}:pending_posts_count`, + this, + "_handleCountChange" + ); + }, + + _handleCountChange(count) { + this.refresh(); + if (count <= 0) { + this.transitionTo("userActivity"); + } + }, }); diff --git a/app/assets/javascripts/discourse/app/routes/user.js b/app/assets/javascripts/discourse/app/routes/user.js index 5a3435eb72..0b54a67a9f 100644 --- a/app/assets/javascripts/discourse/app/routes/user.js +++ b/app/assets/javascripts/discourse/app/routes/user.js @@ -69,6 +69,15 @@ export default DiscourseRoute.extend({ this.messageBus.subscribe(`/u/${user.username_lower}`, (data) => user.loadUserAction(data) ); + this.messageBus.subscribe(`/u/${user.username_lower}/counters`, (data) => { + user.setProperties(data); + Object.entries(data).forEach(([key, value]) => + this.appEvents.trigger( + `count-updated:${user.username_lower}:${key}`, + value + ) + ); + }); }, deactivate() { @@ -76,6 +85,7 @@ export default DiscourseRoute.extend({ const user = this.modelFor("user"); this.messageBus.unsubscribe(`/u/${user.username_lower}`); + this.messageBus.unsubscribe(`/u/${user.username_lower}/counters`); // Remove the search context this.searchService.set("searchContext", null); diff --git a/app/assets/javascripts/discourse/app/templates/components/empty-state.hbs b/app/assets/javascripts/discourse/app/templates/components/empty-state.hbs new file mode 100644 index 0000000000..e903c42cfc --- /dev/null +++ b/app/assets/javascripts/discourse/app/templates/components/empty-state.hbs @@ -0,0 +1,6 @@ +
+ {{@title}} +
+

{{@body}}

+
+
diff --git a/app/assets/javascripts/discourse/app/templates/components/pending-post.hbs b/app/assets/javascripts/discourse/app/templates/components/pending-post.hbs new file mode 100644 index 0000000000..f94003840b --- /dev/null +++ b/app/assets/javascripts/discourse/app/templates/components/pending-post.hbs @@ -0,0 +1 @@ + diff --git a/app/assets/javascripts/discourse/app/templates/user-activity/pending.hbs b/app/assets/javascripts/discourse/app/templates/user-activity/pending.hbs new file mode 100644 index 0000000000..ee48832b71 --- /dev/null +++ b/app/assets/javascripts/discourse/app/templates/user-activity/pending.hbs @@ -0,0 +1,5 @@ +
    + {{#each @model as |pending_post|}} + + {{/each}} +
diff --git a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs index 1c7d94036b..21f989da46 100644 --- a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs +++ b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs @@ -1,10 +1,8 @@ {{#if noContent}} -
- {{model.emptyState.title}} -
-

{{model.emptyState.body}}

-
-
+ {{else}} {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list .topic-list-item" action=(action "loadMore")}} {{topic-dismiss-buttons diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs index a7fe65f355..260e40241c 100644 --- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs +++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs @@ -17,6 +17,12 @@ {{/d-navigation-item}} {{/if}} + {{#if (gt model.pending_posts_count 0)}} + {{#d-navigation-item route="userActivity.pending"}} + {{pendingLabel}} + {{/d-navigation-item}} + {{/if}} + {{#d-navigation-item route="userActivity.likesGiven"}}{{i18n "user_action_groups.1"}}{{/d-navigation-item}} {{#if user.showBookmarks}} diff --git a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs index a384c8adca..105ce3924d 100644 --- a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs +++ b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs @@ -2,12 +2,10 @@ {{#if permissionDenied}}
{{i18n "bookmarks.list_permission_denied"}}
{{else if userDoesNotHaveBookmarks}} -
- {{i18n "user.no_bookmarks_title"}} -
-

{{emptyStateBody}}

-
-
+ {{else}}
{{input type="text" diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs index b138dfbe53..d1a35c252f 100644 --- a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs +++ b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs @@ -7,12 +7,10 @@ {{/if}}
{{else if doesNotHaveNotifications}} -
- {{i18n "user.no_notifications_page_title"}} -
-

{{emptyStateBody}}

-
-
+ {{else}}
{{notifications-filter value=filter onChange=(action (mut filter))}} diff --git a/app/assets/javascripts/discourse/app/templates/user/stream.hbs b/app/assets/javascripts/discourse/app/templates/user/stream.hbs index baa63e4cbd..32c237787d 100644 --- a/app/assets/javascripts/discourse/app/templates/user/stream.hbs +++ b/app/assets/javascripts/discourse/app/templates/user/stream.hbs @@ -2,12 +2,10 @@ {{#if model.isAnotherUsersPage}}
{{model.emptyStateOthers}}
{{else}} -
- {{model.emptyState.title}} -
-

{{model.emptyState.body}}

-
-
+ {{/if}} {{/if}} {{user-stream stream=model.stream}} diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index c3886f25b2..ad1316bb85 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -80,6 +80,7 @@ ] }, "devDependencies": { - "ember-exam": "6.1.0" + "ember-exam": "6.1.0", + "ember-test-selectors": "^6.0.0" } } diff --git a/app/assets/javascripts/discourse/tests/acceptance/pending-posts-test.js b/app/assets/javascripts/discourse/tests/acceptance/pending-posts-test.js new file mode 100644 index 0000000000..05bb8b5880 --- /dev/null +++ b/app/assets/javascripts/discourse/tests/acceptance/pending-posts-test.js @@ -0,0 +1,31 @@ +import { acceptance } from "discourse/tests/helpers/qunit-helpers"; +import { test } from "qunit"; +import { click, visit } from "@ember/test-helpers"; +import { setupApplicationTest as EMBER_CLI_ENV } from "ember-qunit"; + +acceptance("Pending posts - no existing pending posts", function (needs) { + if (!EMBER_CLI_ENV) { + return; // dom helpers not available in legacy env + } + + needs.user(); + + test("No link to pending posts", async function (assert) { + await visit("/u/eviltrout"); + assert.dom(".action-list").doesNotIncludeText("Pending"); + }); +}); + +acceptance("Pending posts - existing pending posts", function (needs) { + if (!EMBER_CLI_ENV) { + return; // dom helpers not available in legacy env + } + + needs.user({ pending_posts_count: 2 }); + + test("Navigate to pending posts", async function (assert) { + await visit("/u/eviltrout"); + await click("[href='/u/eviltrout/activity/pending']"); + assert.dom(".user-stream-item").exists({ count: 2 }); + }); +}); diff --git a/app/assets/javascripts/discourse/tests/fixtures/pending-posts.js b/app/assets/javascripts/discourse/tests/fixtures/pending-posts.js new file mode 100644 index 0000000000..bd14bace7c --- /dev/null +++ b/app/assets/javascripts/discourse/tests/fixtures/pending-posts.js @@ -0,0 +1,32 @@ +export default { + "/posts/eviltrout/pending.json": { + pending_posts: [ + { + id: 2, + avatar_template: "/user_avatar/localhost/eviltrout/{size}/5275.png", + category_id: 2, + created_at: "2021-10-19T10:18:13.238Z", + created_by_id: 19, + name: "Robin Ward", + raw_text: "**bold text**", + title: "Lorem ipsum dolor sit amet", + topic_id: 130, + topic_url: "/t/lorem-ipsum-dolor-sit-amet/130", + username: "eviltrout" + }, + { + id: 1, + avatar_template: "/user_avatar/localhost/eviltrout/{size}/5275.png", + category_id: 2, + created_at: "2021-10-19T09:38:35.110Z", + created_by_id: 19, + name: "Robin Ward", + raw_text: "This will be moderated in theory :thinking:", + title: "Lorem ipsum dolor sit amet", + topic_id: 130, + topic_url: "/t/lorem-ipsum-dolor-sit-amet/130", + username: "eviltrout" + }, + ] + } +}; diff --git a/app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js b/app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js new file mode 100644 index 0000000000..bfeaadcea6 --- /dev/null +++ b/app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js @@ -0,0 +1,23 @@ +import { module, test } from "qunit"; +import { setupRenderingTest } from "ember-qunit"; +import { render } from "@ember/test-helpers"; +import hbs from "htmlbars-inline-precompile"; + +const LEGACY_ENV = !setupRenderingTest; + +module("Integration | Component | empty-state", function (hooks) { + if (LEGACY_ENV) { + return; + } + + setupRenderingTest(hooks); + + test("it renders", async function (assert) { + await render(hbs` + + `); + + assert.dom("[data-test-title]").hasText("title"); + assert.dom("[data-test-body]").hasText("body"); + }); +}); diff --git a/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js b/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js new file mode 100644 index 0000000000..55d4ab43a1 --- /dev/null +++ b/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js @@ -0,0 +1,37 @@ +import { module, test } from "qunit"; +import { setupRenderingTest } from "ember-qunit"; +import { render } from "@ember/test-helpers"; +import hbs from "htmlbars-inline-precompile"; +import PendingPost from "discourse/models/pending-post"; +import createStore from "discourse/tests/helpers/create-store"; + +const LEGACY_ENV = !setupRenderingTest; + +module("Integration | Component | pending-post", function (hooks) { + if (LEGACY_ENV) { + return; + } + + setupRenderingTest(hooks); + + test("it renders", async function (assert) { + const store = createStore(); + store.createRecord("category", { id: 2 }); + const post = PendingPost.create({ + id: 1, + topic_url: "topic-url", + username: "USERNAME", + category_id: 2, + raw_text: "**bold text**", + }); + this.set("post", post); + + await render(hbs``); + + assert.equal( + this.element.querySelector("p.excerpt").textContent.trim(), + "bold text", + "renders the cooked text" + ); + }); +}); diff --git a/app/assets/javascripts/discourse/tests/test-helper.js b/app/assets/javascripts/discourse/tests/test-helper.js index 2fd001c627..e28c99c548 100644 --- a/app/assets/javascripts/discourse/tests/test-helper.js +++ b/app/assets/javascripts/discourse/tests/test-helper.js @@ -2,6 +2,8 @@ import config from "../config/environment"; import { setEnvironment } from "discourse-common/config/environment"; import { start } from "ember-qunit"; import loadEmberExam from "ember-exam/test-support/load"; +import * as QUnit from "qunit"; +import { setup } from "qunit-dom"; setEnvironment("testing"); @@ -20,6 +22,7 @@ document.addEventListener("discourse-booted", () => { ` ); + setup(QUnit.assert); setupTests(config.APP); let loader = loadEmberExam(); loader.loadModules(); diff --git a/app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js b/app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js new file mode 100644 index 0000000000..ef76564f2b --- /dev/null +++ b/app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js @@ -0,0 +1,36 @@ +import { module, test } from "qunit"; +import PendingPost from "discourse/models/pending-post"; +import createStore from "discourse/tests/helpers/create-store"; +import { run } from "@ember/runloop"; + +module("Unit | Model | pending-post", function () { + test("Properties", function (assert) { + const store = createStore(); + const category = store.createRecord("category", { id: 2 }); + const post = PendingPost.create({ + id: 1, + topic_url: "topic-url", + username: "USERNAME", + category_id: 2, + }); + assert.equal(post.postUrl, "topic-url", "topic_url is aliased to postUrl"); + assert.equal(post.truncated, false, "truncated is always false"); + assert.equal( + post.userUrl, + "/u/username", + "it returns user URL from the username" + ); + assert.strictEqual( + post.category, + category, + "it returns the proper category object based on category_id" + ); + }); + test("it cooks raw_text", function (assert) { + const post = run(() => PendingPost.create({ raw_text: "**bold text**" })); + assert.equal( + post.expandedExcerpt.string, + "

bold text

" + ); + }); +}); diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock index 9c5b9bd418..333a1e7f5e 100644 --- a/app/assets/javascripts/yarn.lock +++ b/app/assets/javascripts/yarn.lock @@ -4862,7 +4862,7 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember- rimraf "^3.0.1" semver "^5.5.0" -ember-cli-babel@^7.21.0: +ember-cli-babel@^7.21.0, ember-cli-babel@^7.26.4: version "7.26.6" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39" integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ== @@ -5414,6 +5414,15 @@ ember-template-lint@^1.2.0: resolve "^1.15.1" strip-bom "^3.0.0" +ember-test-selectors@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/ember-test-selectors/-/ember-test-selectors-6.0.0.tgz#ba9bb19550d9dec6e4037d86d2b13c2cfd329341" + integrity sha512-PgYcI9PeNvtKaF0QncxfbS68olMYM1idwuI8v/WxsjOGqUx5bmsu6V17vy/d9hX4mwmjgsBhEghrVasGSuaIgw== + dependencies: + calculate-cache-key-for-tree "^2.0.0" + ember-cli-babel "^7.26.4" + ember-cli-version-checker "^5.1.2" + ember-try-config@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-3.0.0.tgz#012d8c90cae9eb624e2b62040bf7e76a1aa58edc" diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 0506310049..02ced625a4 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -598,6 +598,14 @@ class PostsController < ApplicationController render_serialized(posts, AdminUserActionSerializer) end + def pending + params.require(:username) + user = fetch_user_from_params + raise Discourse::NotFound unless guardian.can_edit_user?(user) + + render_serialized(user.pending_posts.order(created_at: :desc), PendingPostSerializer, root: :pending_posts) + end + protected # We can't break the API for making posts. The new, queue supporting API diff --git a/app/models/reviewable_queued_post.rb b/app/models/reviewable_queued_post.rb index 0ec9de738e..f51d0164eb 100644 --- a/app/models/reviewable_queued_post.rb +++ b/app/models/reviewable_queued_post.rb @@ -7,6 +7,8 @@ class ReviewableQueuedPost < Reviewable DiscourseEvent.trigger(:queued_post_created, self) end + after_commit :compute_user_stats, only: %i[create update] + def build_actions(actions, guardian, args) unless approved? @@ -157,6 +159,16 @@ class ReviewableQueuedPost < Reviewable delete_as_spammer: true } end + + def compute_user_stats + return unless status_changed_from_or_to_pending? + created_by.user_stat.update_pending_posts + end + + def status_changed_from_or_to_pending? + saved_change_to_id?(from: nil) && pending? || + saved_change_to_status?(from: self.class.statuses[:pending]) + end end # == Schema Information diff --git a/app/models/user.rb b/app/models/user.rb index 5df57647b9..55afe32263 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -38,6 +38,7 @@ class User < ActiveRecord::Base has_many :reviewable_scores, dependent: :destroy has_many :invites, foreign_key: :invited_by_id, dependent: :destroy has_many :user_custom_fields, dependent: :destroy + has_many :pending_posts, -> { merge(Reviewable.pending) }, class_name: 'ReviewableQueuedPost', foreign_key: :created_by_id has_one :user_option, dependent: :destroy has_one :user_avatar, dependent: :destroy diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb index e6cab54c24..8fad8fcfb3 100644 --- a/app/models/user_stat.rb +++ b/app/models/user_stat.rb @@ -291,6 +291,16 @@ class UserStat < ActiveRecord::Base Discourse.redis.setex(last_seen_key(id), MAX_TIME_READ_DIFF, val) end + def update_pending_posts + update(pending_posts_count: user.pending_posts.count) + MessageBus.publish( + "/u/#{user.username_lower}/counters", + { pending_posts_count: pending_posts_count }, + user_ids: [user.id], + group_ids: [Group::AUTO_GROUPS[:staff]] + ) + end + protected def trigger_badges @@ -323,5 +333,7 @@ end # distinct_badge_count :integer default(0), not null # first_unread_pm_at :datetime not null # digest_attempted_at :datetime -# draft_count :integer default(0), not null # post_edits_count :integer +# draft_count :integer default(0), not null +# pending_posts_count :integer default(0), not null +# diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb index 4740969dc7..0692d60919 100644 --- a/app/serializers/current_user_serializer.rb +++ b/app/serializers/current_user_serializer.rb @@ -41,7 +41,7 @@ class CurrentUserSerializer < BasicUserSerializer :dismissed_banner_key, :is_anonymous, :reviewable_count, - :read_faq, + :read_faq?, :automatically_unpin_topics, :mailing_list_mode, :treat_as_new_topic_start_date, @@ -67,6 +67,10 @@ class CurrentUserSerializer < BasicUserSerializer :can_review, :draft_count, :default_calendar, + :pending_posts_count + + delegate :user_stat, to: :object, private: true + delegate :any_posts, :draft_count, :pending_posts_count, :read_faq?, to: :user_stat def groups owned_group_ids = GroupUser.where(user_id: id, owner: true).pluck(:group_id).to_set @@ -93,14 +97,6 @@ class CurrentUserSerializer < BasicUserSerializer scope.can_create_group? end - def read_faq - object.user_stat.read_faq? - end - - def any_posts - object.user_stat.any_posts - end - def hide_profile_and_presence object.user_option.hide_profile_and_presence end @@ -321,8 +317,4 @@ class CurrentUserSerializer < BasicUserSerializer def include_has_topic_draft? Draft.has_topic_draft(object) end - - def draft_count - object.user_stat.draft_count - end end diff --git a/app/serializers/pending_post_serializer.rb b/app/serializers/pending_post_serializer.rb new file mode 100644 index 0000000000..9c0c7ce3bb --- /dev/null +++ b/app/serializers/pending_post_serializer.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +class PendingPostSerializer < ApplicationSerializer + attributes :id, + :avatar_template, + :category_id, + :created_at, + :created_by_id, + :name, + :raw_text, + :title, + :topic_id, + :topic_url, + :username + + delegate :created_by, :payload, :topic, to: :object, private: true + delegate :url, to: :topic, prefix: true, allow_nil: true + delegate :avatar_template, :name, :username, to: :created_by, allow_nil: true + + def raw_text + payload["raw"] + end + + def title + payload["title"] || topic.title + end +end diff --git a/app/serializers/user_card_serializer.rb b/app/serializers/user_card_serializer.rb index dd41c2c9b8..b19428d0cd 100644 --- a/app/serializers/user_card_serializer.rb +++ b/app/serializers/user_card_serializer.rb @@ -65,7 +65,8 @@ class UserCardSerializer < BasicUserSerializer :flair_bg_color, :flair_color, :featured_topic, - :timezone + :timezone, + :pending_posts_count untrusted_attributes :bio_excerpt, :website, @@ -77,6 +78,13 @@ class UserCardSerializer < BasicUserSerializer has_many :featured_user_badges, embed: :ids, serializer: UserBadgeSerializer, root: :user_badges + delegate :user_stat, to: :object, private: true + delegate :pending_posts_count, to: :user_stat + + def include_pending_posts_count? + scope.is_me?(object) || scope.is_staff? + end + def include_email? (object.id && object.id == scope.user.try(:id)) || (scope.is_staff? && object.staged?) diff --git a/app/serializers/web_hook_user_serializer.rb b/app/serializers/web_hook_user_serializer.rb index 16f32b6d4c..10defdb706 100644 --- a/app/serializers/web_hook_user_serializer.rb +++ b/app/serializers/web_hook_user_serializer.rb @@ -36,6 +36,7 @@ class WebHookUserSerializer < UserSerializer user_auth_tokens user_auth_token_logs use_logo_small_as_avatar + pending_posts_count }.each do |attr| define_method("include_#{attr}?") do false diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 556c656765..9ee9bf3b73 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -3514,6 +3514,9 @@ en: title: "This topic is a personal message" help: "This topic is a personal message" posts: "Posts" + pending_posts: + label: "Pending" + label_with_count: "Pending (%{count})" # keys ending with _MF use message format, see https://meta.discourse.org/t/message-format-support-for-localization/7035 for details posts_likes_MF: | diff --git a/config/routes.rb b/config/routes.rb index 4444f1e92d..041b713b7d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -579,6 +579,7 @@ Discourse::Application.routes.draw do get "posts/:id/reply-ids/all" => "posts#all_reply_ids" get "posts/:username/deleted" => "posts#deleted_posts", constraints: { username: RouteFormat.username } get "posts/:username/flagged" => "posts#flagged_posts", constraints: { username: RouteFormat.username } + get "posts/:username/pending" => "posts#pending", constraints: { username: RouteFormat.username } %w{groups g}.each do |root_path| resources :groups, id: RouteFormat.username, path: root_path do diff --git a/db/migrate/20210915142958_add_pending_posts_count_to_user_stats.rb b/db/migrate/20210915142958_add_pending_posts_count_to_user_stats.rb new file mode 100644 index 0000000000..960f76babf --- /dev/null +++ b/db/migrate/20210915142958_add_pending_posts_count_to_user_stats.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddPendingPostsCountToUserStats < ActiveRecord::Migration[6.1] + def change + add_column :user_stats, :pending_posts_count, :integer, null: false, default: 0 + end +end diff --git a/db/post_migrate/20211019152356_populate_pending_posts_count_column.rb b/db/post_migrate/20211019152356_populate_pending_posts_count_column.rb new file mode 100644 index 0000000000..eeac87e479 --- /dev/null +++ b/db/post_migrate/20211019152356_populate_pending_posts_count_column.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +class PopulatePendingPostsCountColumn < ActiveRecord::Migration[6.1] + def up + execute <<~SQL + WITH to_update AS ( + SELECT COUNT(id) AS posts, created_by_id + FROM reviewables + WHERE type = 'ReviewableQueuedPost' + AND status = #{ReviewableQueuedPost.statuses[:pending]} + GROUP BY created_by_id + ) + UPDATE user_stats + SET pending_posts_count = to_update.posts + FROM to_update + WHERE to_update.created_by_id = user_stats.user_id + SQL + end + + def down + end +end diff --git a/lib/guardian.rb b/lib/guardian.rb index 7651baf063..719b192851 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -550,6 +550,10 @@ class Guardian @user.has_trust_level_or_staff?(SiteSetting.min_trust_level_for_here_mention) end + def is_me?(other) + other && authenticated? && other.is_a?(User) && @user == other + end + private def is_my_own?(obj) @@ -562,10 +566,6 @@ class Guardian false end - def is_me?(other) - other && authenticated? && other.is_a?(User) && @user == other - end - def is_not_me?(other) @user.blank? || !is_me?(other) end diff --git a/package.json b/package.json index 7881bcf8f9..e71e86bdd1 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "pretender": "^3.4.7", "puppeteer": "1.20", "qunit": "2.8.0", + "qunit-dom": "^2.0.0", "route-recognizer": "^0.3.3", "sinon": "^9.0.2", "squoosh": "discourse/squoosh#dc9649d" diff --git a/spec/models/reviewable_queued_post_spec.rb b/spec/models/reviewable_queued_post_spec.rb index 92f17f7bf4..92fb1653a3 100644 --- a/spec/models/reviewable_queued_post_spec.rb +++ b/spec/models/reviewable_queued_post_spec.rb @@ -196,4 +196,36 @@ RSpec.describe ReviewableQueuedPost, type: :model do expect(Post.count).to eq(post_count) end end + + describe "Callbacks" do + context "when creating a new pending reviewable" do + let(:reviewable) { Fabricate.build(:reviewable_queued_post_topic, category: category, created_by: user) } + let(:user) { Fabricate(:user) } + let(:user_stats) { user.user_stat } + + it "updates user stats" do + user_stats.expects(:update_pending_posts) + reviewable.save! + end + end + + context "when updating an existing reviewable" do + let!(:reviewable) { Fabricate(:reviewable_queued_post_topic, category: category) } + let(:user_stats) { reviewable.created_by.user_stat } + + context "when status changes from 'pending' to something else" do + it "updates user stats" do + user_stats.expects(:update_pending_posts) + reviewable.update!(status: described_class.statuses[:approved]) + end + end + + context "when status doesn’t change" do + it "doesn’t update user stats" do + user_stats.expects(:update_pending_posts).never + reviewable.update!(score: 10) + end + end + end + end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 7113318e6e..f1b2f7a27d 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -9,6 +9,8 @@ describe User do I18n.t(:"activerecord.errors.models.user.attributes.#{keys.join('.')}") end + it { is_expected.to have_many(:pending_posts).class_name('ReviewableQueuedPost').with_foreign_key(:created_by_id) } + context 'validations' do describe '#username' do it { is_expected.to validate_presence_of :username } diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb index 3bc9189980..6ebe36f1bf 100644 --- a/spec/models/user_stat_spec.rb +++ b/spec/models/user_stat_spec.rb @@ -261,4 +261,27 @@ describe UserStat do expect(user.user_stat.draft_count).to eq(3) end end + + describe "#update_pending_posts" do + subject(:update_pending_posts) { stat.update_pending_posts } + + let!(:reviewable) { Fabricate(:reviewable_queued_post) } + let(:user) { reviewable.created_by } + let(:stat) { user.user_stat } + + before do + stat.update!(pending_posts_count: 0) # the reviewable callback will have set this to 1 already. + end + + it "sets 'pending_posts_count'" do + expect { update_pending_posts }.to change { stat.pending_posts_count }.to 1 + end + + it "publishes a message to clients" do + MessageBus.expects(:publish).with("/u/#{user.username_lower}/counters", + { pending_posts_count: 1 }, + user_ids: [user.id], group_ids: [Group::AUTO_GROUPS[:staff]]) + update_pending_posts + end + end end diff --git a/spec/requests/api/schemas/json/user_get_response.json b/spec/requests/api/schemas/json/user_get_response.json index d6261a91bc..45fbbf0eae 100644 --- a/spec/requests/api/schemas/json/user_get_response.json +++ b/spec/requests/api/schemas/json/user_get_response.json @@ -206,6 +206,9 @@ "pending_count": { "type": "integer" }, + "pending_posts_count": { + "type": "integer" + }, "profile_view_count": { "type": "integer" }, diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb index 632fc24ed1..1091dfb5b9 100644 --- a/spec/requests/posts_controller_spec.rb +++ b/spec/requests/posts_controller_spec.rb @@ -2156,6 +2156,101 @@ describe PostsController do end end + describe "#pending" do + subject(:request) { get "/posts/#{user.username}/pending.json" } + + context "when user is not logged in" do + it_behaves_like "action requires login", :get, "/posts/system/pending.json" + end + + context "when user is logged in" do + let(:pending_posts) { response.parsed_body["pending_posts"] } + + before { sign_in(current_user) } + + context "when current user is the same as user" do + let(:current_user) { user } + + context "when there are existing pending posts" do + let!(:owner_pending_posts) { Fabricate.times(2, :reviewable_queued_post, created_by: user) } + let!(:other_pending_post) { Fabricate(:reviewable_queued_post) } + let(:expected_keys) do + %w[ + avatar_template + category_id + created_at + created_by_id + name + raw_text + title + topic_id + topic_url + username + ] + end + + it "returns user's pending posts" do + request + expect(pending_posts).to all include "id" => be_in(owner_pending_posts.map(&:id)) + expect(pending_posts).to all include(*expected_keys) + end + end + + context "when there aren't any pending posts" do + it "returns an empty array" do + request + expect(pending_posts).to be_empty + end + end + end + + context "when current user is a staff member" do + let(:current_user) { moderator } + + context "when there are existing pending posts" do + let!(:owner_pending_posts) { Fabricate.times(2, :reviewable_queued_post, created_by: user) } + let!(:other_pending_post) { Fabricate(:reviewable_queued_post) } + let(:expected_keys) do + %w[ + avatar_template + category_id + created_at + created_by_id + name + raw_text + title + topic_id + topic_url + username + ] + end + + it "returns user's pending posts" do + request + expect(pending_posts).to all include "id" => be_in(owner_pending_posts.map(&:id)) + expect(pending_posts).to all include(*expected_keys) + end + end + + context "when there aren't any pending posts" do + it "returns an empty array" do + request + expect(pending_posts).to be_empty + end + end + end + + context "when current user is another user" do + let(:current_user) { Fabricate(:user) } + + it "does not allow access" do + request + expect(response).to have_http_status :not_found + end + end + end + end + describe Plugin::Instance do describe '#add_permitted_post_create_param' do fab!(:user) { Fabricate(:user) } diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb index 3b63aff05e..c07ceff89f 100644 --- a/spec/serializers/current_user_serializer_spec.rb +++ b/spec/serializers/current_user_serializer_spec.rb @@ -3,11 +3,12 @@ require 'rails_helper' RSpec.describe CurrentUserSerializer do + subject(:serializer) { described_class.new(user, scope: guardian, root: false) } + + let(:guardian) { Guardian.new } + context "when SSO is not enabled" do fab!(:user) { Fabricate(:user) } - let :serializer do - CurrentUserSerializer.new(user, scope: Guardian.new, root: false) - end it "should not include the external_id field" do payload = serializer.as_json @@ -22,10 +23,6 @@ RSpec.describe CurrentUserSerializer do user end - let :serializer do - CurrentUserSerializer.new(user, scope: Guardian.new, root: false) - end - it "should include the external_id" do SiteSetting.discourse_connect_url = "http://example.com/discourse_sso" SiteSetting.discourse_connect_secret = "12345678910" @@ -40,9 +37,6 @@ RSpec.describe CurrentUserSerializer do fab!(:category1) { Fabricate(:category) } fab!(:category2) { Fabricate(:category) } fab!(:category3) { Fabricate(:category) } - let :serializer do - CurrentUserSerializer.new(user, scope: Guardian.new, root: false) - end it "should include empty top_category_ids array" do payload = serializer.as_json @@ -77,9 +71,6 @@ RSpec.describe CurrentUserSerializer do tag_id: tag.id ) end - let :serializer do - CurrentUserSerializer.new(user, scope: Guardian.new, root: false) - end it 'include muted tag ids' do payload = serializer.as_json @@ -89,9 +80,7 @@ RSpec.describe CurrentUserSerializer do context "#second_factor_enabled" do fab!(:user) { Fabricate(:user) } - let :serializer do - CurrentUserSerializer.new(user, scope: Guardian.new(user), root: false) - end + let(:guardian) { Guardian.new(user) } let(:json) { serializer.as_json } it "is false by default" do @@ -120,18 +109,15 @@ RSpec.describe CurrentUserSerializer do end context "#groups" do - fab!(:member) { Fabricate(:user) } - let :serializer do - CurrentUserSerializer.new(member, scope: Guardian.new, root: false) - end + fab!(:user) { Fabricate(:user) } it "should only show visible groups" do Fabricate.build(:group, visibility_level: Group.visibility_levels[:public]) hidden_group = Fabricate.build(:group, visibility_level: Group.visibility_levels[:owners]) public_group = Fabricate.build(:group, visibility_level: Group.visibility_levels[:public], name: "UppercaseGroupName") - hidden_group.add(member) + hidden_group.add(user) hidden_group.save! - public_group.add(member) + public_group.add(user) public_group.save! payload = serializer.as_json @@ -143,9 +129,6 @@ RSpec.describe CurrentUserSerializer do context "#has_topic_draft" do fab!(:user) { Fabricate(:user) } - let :serializer do - CurrentUserSerializer.new(user, scope: Guardian.new, root: false) - end it "is not included by default" do payload = serializer.as_json @@ -169,23 +152,36 @@ RSpec.describe CurrentUserSerializer do end - context '#can_review' do - it 'return false for regular users' do - serializer = serializer(Fabricate(:user)) - payload = serializer.as_json + context "#can_review" do + let(:guardian) { Guardian.new(user) } + let(:payload) { serializer.as_json } - expect(payload[:can_review]).to eq(false) + context "when user is a regular one" do + let(:user) { Fabricate(:user) } + + it "return false for regular users" do + expect(payload[:can_review]).to eq(false) + end end - it 'returns trus for staff' do - serializer = serializer(Fabricate(:admin)) - payload = serializer.as_json + context "when user is a staff member" do + let(:user) { Fabricate(:admin) } - expect(payload[:can_review]).to eq(true) + it "returns true" do + expect(payload[:can_review]).to eq(true) + end end + end - def serializer(user) - CurrentUserSerializer.new(user, scope: Guardian.new(user), root: false) + describe "#pending_posts_count" do + subject(:pending_posts_count) { serializer.pending_posts_count } + + let(:user) { Fabricate(:user) } + + before { user.user_stat.pending_posts_count = 3 } + + it "serializes 'pending_posts_count'" do + expect(pending_posts_count).to eq 3 end end end diff --git a/spec/serializers/pending_post_serializer_spec.rb b/spec/serializers/pending_post_serializer_spec.rb new file mode 100644 index 0000000000..3a24342fac --- /dev/null +++ b/spec/serializers/pending_post_serializer_spec.rb @@ -0,0 +1,59 @@ +# frozen_string_literal: true + +require "rails_helper" + +RSpec.describe PendingPostSerializer do + subject(:serializer) { described_class.new(post, scope: guardian, root: false) } + + let(:guardian) { Guardian.new(author) } + let(:author) { post.created_by } + + before { freeze_time } + + context "when creating a new topic" do + let(:post) { Fabricate(:reviewable_queued_post_topic) } + let(:expected_attributes) do + { + id: post.id, + avatar_template: author.avatar_template, + category_id: post.category_id, + created_at: Time.current, + created_by_id: author.id, + name: author.name, + raw_text: post.payload["raw"], + title: post.payload["title"], + topic_id: nil, + topic_url: nil, + username: author.username + } + end + + it "serializes a pending post properly" do + expect(serializer.as_json).to match expected_attributes + end + end + + context "when not creating a new topic" do + let(:post) { Fabricate(:reviewable_queued_post) } + let(:topic) { post.topic } + let(:expected_attributes) do + { + id: post.id, + avatar_template: author.avatar_template, + category_id: post.category_id, + created_at: Time.current, + created_by_id: author.id, + name: author.name, + raw_text: post.payload["raw"], + title: topic.title, + topic_id: topic.id, + topic_url: topic.url, + username: author.username + } + end + + it "serializes a pending post properly" do + expect(serializer.as_json).to match expected_attributes + end + end +end diff --git a/spec/serializers/user_card_serializer_spec.rb b/spec/serializers/user_card_serializer_spec.rb index f6285f2150..9239630c97 100644 --- a/spec/serializers/user_card_serializer_spec.rb +++ b/spec/serializers/user_card_serializer_spec.rb @@ -37,4 +37,39 @@ describe UserCardSerializer do expect(json[:unconfirmed_emails]).to be_nil end end + + describe "#pending_posts_count" do + let(:user) { Fabricate(:user) } + let(:serializer) { described_class.new(user, scope: guardian, root: false) } + let(:json) { serializer.as_json } + + context "when guardian is another user" do + let(:guardian) { Guardian.new(other_user) } + + context "when other user is not a staff member" do + let(:other_user) { Fabricate(:user) } + + it "does not serialize pending_posts_count" do + expect(json.keys).not_to include :pending_posts_count + end + end + + context "when other user is a staff member" do + let(:other_user) { Fabricate(:user, moderator: true) } + + it "serializes pending_posts_count" do + expect(json[:pending_posts_count]).to eq 0 + end + end + end + + context "when guardian is the current user" do + let(:guardian) { Guardian.new(user) } + + it "serializes pending_posts_count" do + expect(json[:pending_posts_count]).to eq 0 + end + end + + end end From 0ab57975a46a0821e60529371c0ce4925e4ebf41 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 29 Nov 2021 09:33:40 +0000 Subject: [PATCH 136/168] FIX: Ensure widget hooks always call the correct instance (#15127) Widgets instances are ephemeral - they change on every re-render. We always want to notify the 'most recent' widget instance of events. This regressed in 1b9cf1b1 because the touchStart and drag hooks would persist the widget instance from the initial render. This commit switches TouchStart and Drag back to the pattern other events use, so that the most recent instance is always called. The performance benefits of per-element event listeners are retained. --- .../discourse/app/widgets/hooks.js | 110 ++++++++++-------- 1 file changed, 60 insertions(+), 50 deletions(-) diff --git a/app/assets/javascripts/discourse/app/widgets/hooks.js b/app/assets/javascripts/discourse/app/widgets/hooks.js index 9bc6ea72b9..17c34d1519 100644 --- a/app/assets/javascripts/discourse/app/widgets/hooks.js +++ b/app/assets/javascripts/discourse/app/widgets/hooks.js @@ -1,5 +1,4 @@ /*eslint no-loop-func:0*/ -import { bind } from "discourse-common/utils/decorators"; const CLICK_ATTRIBUTE_NAME = "_discourse_click_widget"; const DOUBLE_CLICK_ATTRIBUTE_NAME = "_discourse_double_click_widget"; @@ -8,6 +7,7 @@ const MOUSE_DOWN_OUTSIDE_ATTRIBUTE_NAME = "_discourse_mouse_down_outside_widget"; const KEY_UP_ATTRIBUTE_NAME = "_discourse_key_up_widget"; const KEY_DOWN_ATTRIBUTE_NAME = "_discourse_key_down_widget"; +const DRAG_ATTRIBUTE_NAME = "_discourse_drag_widget"; const INPUT_ATTRIBUTE_NAME = "_discourse_input_widget"; const CHANGE_ATTRIBUTE_NAME = "_discourse_change_widget"; const MOUSE_DOWN_ATTRIBUTE_NAME = "_discourse_mouse_down_widget"; @@ -15,6 +15,7 @@ const MOUSE_UP_ATTRIBUTE_NAME = "_discourse_mouse_up_widget"; const MOUSE_MOVE_ATTRIBUTE_NAME = "_discourse_mouse_move_widget"; const MOUSE_OVER_ATTRIBUTE_NAME = "_discourse_mouse_over_widget"; const MOUSE_OUT_ATTRIBUTE_NAME = "_discourse_mouse_out_widget"; +const TOUCH_START_ATTRIBUTE_NAME = "_discourse_touch_start_widget"; const TOUCH_END_ATTRIBUTE_NAME = "_discourse_touch_end_widget"; class WidgetBaseHook { @@ -69,79 +70,88 @@ export const WidgetTouchEndHook = buildHook(TOUCH_END_ATTRIBUTE_NAME); // listeners for these events. // Instead, the WidgetTouchStartHook and WidgetDragHook automatically register listeners on // the specific widget DOM elements when required. +function touchStartHandler(e) { + return e.currentTarget[TOUCH_START_ATTRIBUTE_NAME].touchStart(e); +} + export class WidgetTouchStartHook extends WidgetBaseHook { hook(node, propertyName, previousValue) { + node[TOUCH_START_ATTRIBUTE_NAME] = this.widget; if (!previousValue) { - // Adding to DOM - node.addEventListener("touchstart", this.callback, { passive: false }); + // Element added to DOM + node.addEventListener("touchstart", touchStartHandler, { + passive: false, + }); } } unhook(node, propertyName, newValue) { if (!newValue) { - node.removeEventListener("touchstart", this.callback); + // Element removed from DOM + node.removeEventListener("touchstart", touchStartHandler); } } - - @bind - callback(e) { - this.widget.touchStart(e); - } } -let _currentlyDraggingHook; +let _currentlyDraggingElement; + +function dragStart(e) { + e.preventDefault(); + e.stopPropagation(); + if (_currentlyDraggingElement) { + dragEnd(); + } + _currentlyDraggingElement = e.currentTarget; + document.body.classList.add("widget-dragging"); + document.addEventListener("touchmove", drag, { passive: false }); + document.addEventListener("mousemove", drag, { passive: false }); + document.addEventListener("touchend", dragEnd); + document.addEventListener("mouseup", dragEnd); +} + +function drag(e) { + const widget = _currentlyDraggingElement[DRAG_ATTRIBUTE_NAME]; + if (event.type === "mousemove") { + widget.drag(e); + } else { + const tt = e.targetTouches[0]; + e.preventDefault(); + e.stopPropagation(); + widget.drag(tt); + } +} + +function dragEnd(e) { + document.body.classList.remove("widget-dragging"); + document.removeEventListener("touchmove", drag); + document.removeEventListener("mousemove", drag); + document.removeEventListener("touchend", dragEnd); + document.removeEventListener("mouseup", dragEnd); + const widget = _currentlyDraggingElement[DRAG_ATTRIBUTE_NAME]; + widget.dragEnd(e); + _currentlyDraggingElement = null; +} + export class WidgetDragHook extends WidgetBaseHook { hook(node, propertyName, previousValue) { + node[DRAG_ATTRIBUTE_NAME] = this.widget; if (!previousValue) { // Adding to DOM - node.addEventListener("touchstart", this.startDrag, { passive: false }); - node.addEventListener("mousedown", this.startDrag, { passive: false }); + node.addEventListener("touchstart", dragStart, { passive: false }); + node.addEventListener("mousedown", dragStart, { passive: false }); } } unhook(node, propertyName, newValue) { if (!newValue) { // Removing from DOM - node.removeEventListener("touchstart", this.startDrag); - node.removeEventListener("mousedown", this.startDrag); + if (_currentlyDraggingElement === node) { + dragEnd(); + } + node.removeEventListener("touchstart", dragStart); + node.removeEventListener("mousedown", dragStart); } } - - @bind - startDrag(e) { - e.preventDefault(); - e.stopPropagation(); - _currentlyDraggingHook?.dragEnd(); - _currentlyDraggingHook = this; - document.body.classList.add("widget-dragging"); - document.addEventListener("touchmove", this.drag, { passive: false }); - document.addEventListener("mousemove", this.drag, { passive: false }); - document.addEventListener("touchend", this.dragEnd); - document.addEventListener("mouseup", this.dragEnd); - } - - @bind - drag(e) { - if (event.type === "mousemove") { - this.widget.drag(e); - } else { - const tt = e.targetTouches[0]; - e.preventDefault(); - e.stopPropagation(); - this.widget.drag(tt); - } - } - - @bind - dragEnd(e) { - document.body.classList.remove("widget-dragging"); - document.removeEventListener("touchmove", this.drag); - document.removeEventListener("mousemove", this.drag); - document.removeEventListener("touchend", this.dragEnd); - document.removeEventListener("mouseup", this.dragEnd); - this.widget.dragEnd(e); - _currentlyDraggingHook = null; - } } function nodeCallback(node, attrName, cb, options = { rerender: true }) { From 354f88358c5e406b728aa6a1d726ce85418c2d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= Date: Mon, 29 Nov 2021 11:08:05 +0100 Subject: [PATCH 137/168] DEV: Add ember-test-selectors to production env --- app/assets/javascripts/discourse/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index ad1316bb85..d8a89ee421 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -51,6 +51,7 @@ "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^5.1.2", "ember-source": "~3.15.0", + "ember-test-selectors": "^6.0.0", "eslint": "^7.27.0", "html-entities": "^2.1.0", "js-yaml": "^4.0.0", From 3dc0b9e077546ee51b652a3f72ea46c153a40147 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 29 Nov 2021 14:29:11 +0100 Subject: [PATCH 138/168] UX: closes multi-select on selection when maximum=1 (#15092) --- .../select-kit/multi-select-test.js | 72 +++++++++++++++++++ .../select-kit/addon/components/select-kit.js | 5 +- 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js index 8352018857..131a5f65a4 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js @@ -67,3 +67,75 @@ discourseModule( }); } ); + +discourseModule( + "Integration | Component | select-kit/multi-select | maximum=1", + function (hooks) { + setupRenderingTest(hooks); + + hooks.beforeEach(function () { + this.set("subject", selectKit()); + }); + + componentTest("content", { + template: hbs` + {{multi-select + value=value + content=content + options=(hash maximum=1) + }} + `, + + beforeEach() { + setDefaultState(this); + }, + + async test(assert) { + await this.subject.expand(); + await this.subject.selectRowByValue(1); + + assert.notOk(this.subject.isExpanded(), "it closes the dropdown"); + + await this.subject.expand(); + await this.subject.deselectItemByValue(1); + + assert.ok( + this.subject.isExpanded(), + "it doesn’t close the dropdown when no selection has been made" + ); + }, + }); + } +); + +discourseModule( + "Integration | Component | select-kit/multi-select | maximum=2", + function (hooks) { + setupRenderingTest(hooks); + + hooks.beforeEach(function () { + this.set("subject", selectKit()); + }); + + componentTest("content", { + template: hbs` + {{multi-select + value=value + content=content + options=(hash maximum=2) + }} + `, + + beforeEach() { + setDefaultState(this); + }, + + async test(assert) { + await this.subject.expand(); + await this.subject.selectRowByValue(1); + + assert.ok(this.subject.isExpanded(), "it doesn’t close the dropdown"); + }, + }); + } +); diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js index a32e864b33..8aca155af8 100644 --- a/app/assets/javascripts/select-kit/addon/components/select-kit.js +++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js @@ -444,7 +444,10 @@ export default Component.extend( resolve(items); }).finally(() => { if (!this.isDestroying && !this.isDestroyed) { - if (this.selectKit.options.closeOnChange) { + if ( + this.selectKit.options.closeOnChange || + (isPresent(value) && this.selectKit.options.maximum === 1) + ) { this.selectKit.close(event); } From c9e0ad5ec4ab5ae1d681bcd7f20e7d7bbdb146ce Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 29 Nov 2021 19:09:05 +0100 Subject: [PATCH 139/168] DEV: Remove build:stamp task and related code (#15069) I don't think we use `build:stamp` task anymore, nor we rely on config/version.rb --- lib/discourse.rb | 12 ------------ lib/tasks/build.rake | 15 --------------- 2 files changed, 27 deletions(-) delete mode 100644 lib/tasks/build.rake diff --git a/lib/discourse.rb b/lib/discourse.rb index 66ea0b73f3..3e641b4e29 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -657,16 +657,7 @@ module Discourse end end - def self.ensure_version_file_loaded - unless @version_file_loaded - version_file = "#{Rails.root}/config/version.rb" - require version_file if File.exists?(version_file) - @version_file_loaded = true - end - end - def self.git_version - ensure_version_file_loaded $git_version ||= begin git_cmd = 'git rev-parse HEAD' @@ -675,7 +666,6 @@ module Discourse end def self.git_branch - ensure_version_file_loaded $git_branch ||= begin git_cmd = 'git rev-parse --abbrev-ref HEAD' @@ -684,7 +674,6 @@ module Discourse end def self.full_version - ensure_version_file_loaded $full_version ||= begin git_cmd = 'git describe --dirty --match "v[0-9]*"' @@ -693,7 +682,6 @@ module Discourse end def self.last_commit_date - ensure_version_file_loaded $last_commit_date ||= begin git_cmd = 'git log -1 --format="%ct"' diff --git a/lib/tasks/build.rake b/lib/tasks/build.rake deleted file mode 100644 index 3f719c8ea2..0000000000 --- a/lib/tasks/build.rake +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -desc "stamp the current build with the git hash placed in version.rb" -task "build:stamp" => :environment do - git_version = `git rev-parse HEAD`.strip - git_branch = `git rev-parse --abbrev-ref HEAD` - full_version = `git describe --dirty --match "v[0-9]*"` - - File.open(Rails.root.to_s + '/config/version.rb', 'w') do |f| - f.write("$git_version = #{git_version.inspect}\n") - f.write("$git_branch = #{git_branch.inspect}\n") - f.write("$full_version = #{full_version.inspect}\n") - end - puts "Stamped current build with #{git_version} #{git_branch} #{full_version}" -end From 433f9a4dc91fe6cd375212a0801ecc380e6ed9e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Nov 2021 22:52:04 +0100 Subject: [PATCH 140/168] Build(deps): Bump parser from 3.0.3.0 to 3.0.3.1 (#15130) Bumps [parser](https://github.com/whitequark/parser) from 3.0.3.0 to 3.0.3.1. - [Release notes](https://github.com/whitequark/parser/releases) - [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/whitequark/parser/compare/v3.0.3.0...v3.0.3.1) --- updated-dependencies: - dependency-name: parser dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cfd279d729..453c996af2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -291,7 +291,7 @@ GEM parallel (1.21.0) parallel_tests (3.7.3) parallel - parser (3.0.3.0) + parser (3.0.3.1) ast (~> 2.4.1) pg (1.2.3) progress (3.6.0) From f70e6c302fddd38595a1fc90e24964a2cb0716bb Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Tue, 30 Nov 2021 08:33:06 +1000 Subject: [PATCH 141/168] DEV: Switch to using uppy uploads in composer by default (#15058) This is a big change to change over to using the uppy upload mixin in the composer by default. This gets rid of the temporary composer-editor-uppy component, as well as removing the old ComposerUpload mixin and copying over any missing functions that were not yet implemented by ComposerUploadUppy. This has been working well on our hosting for some time now and has led us to several bug fixes. This commit also deletes the old plugin API for adding preprocessors for the uploads. The accepted method of doing this now is via an uppy preprocessor plugin, which we have several examples of in the core codebase. Leaving the `enable_experimental_composer_uploader` site setting intact for now because some plugins still rely on it, this will be removed at a later date. One step closer to ending the jQuery file uploader saga... --- .../app/components/composer-editor-uppy.js | 14 - .../app/components/composer-editor.js | 24 +- .../discourse/app/controllers/composer.js | 9 - ...ter-media-optimization-upload-processor.js | 35 +- .../discourse/app/lib/plugin-api.js | 39 +- .../app/mixins/composer-upload-uppy.js | 31 ++ .../discourse/app/mixins/composer-upload.js | 367 ------------------ .../discourse/app/templates/composer.hbs | 2 +- .../acceptance/composer-attachment-test.js | 326 ---------------- .../acceptance/composer-uploads-uppy-test.js | 3 - .../discourse/tests/helpers/qunit-helpers.js | 2 - config/site_settings.yml | 2 + docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md | 30 ++ 13 files changed, 92 insertions(+), 792 deletions(-) delete mode 100644 app/assets/javascripts/discourse/app/components/composer-editor-uppy.js delete mode 100644 app/assets/javascripts/discourse/app/mixins/composer-upload.js delete mode 100644 app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js create mode 100644 docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md diff --git a/app/assets/javascripts/discourse/app/components/composer-editor-uppy.js b/app/assets/javascripts/discourse/app/components/composer-editor-uppy.js deleted file mode 100644 index 1e230a3781..0000000000 --- a/app/assets/javascripts/discourse/app/components/composer-editor-uppy.js +++ /dev/null @@ -1,14 +0,0 @@ -import ComposerEditor from "discourse/components/composer-editor"; -import { alias } from "@ember/object/computed"; -import ComposerUploadUppy from "discourse/mixins/composer-upload-uppy"; - -export default ComposerEditor.extend(ComposerUploadUppy, { - layoutName: "components/composer-editor", - fileUploadElementId: "file-uploader", - eventPrefix: "composer", - uploadType: "composer", - uppyId: "composer-editor-uppy", - composerModel: alias("composer"), - composerModelContentKey: "reply", - editorInputClass: ".d-editor-input", -}); diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js index a5287c8eef..80b9481207 100644 --- a/app/assets/javascripts/discourse/app/components/composer-editor.js +++ b/app/assets/javascripts/discourse/app/components/composer-editor.js @@ -3,6 +3,7 @@ import { authorizesAllExtensions, authorizesOneOrMoreImageExtensions, } from "discourse/lib/uploads"; +import { alias } from "@ember/object/computed"; import { BasePlugin } from "@uppy/core"; import { resolveAllShortUrls } from "pretty-text/upload-short-url"; import { @@ -27,7 +28,7 @@ import { import { later, next, schedule, throttle } from "@ember/runloop"; import Component from "@ember/component"; import Composer from "discourse/models/composer"; -import ComposerUpload from "discourse/mixins/composer-upload"; +import ComposerUploadUppy from "discourse/mixins/composer-upload-uppy"; import EmberObject from "@ember/object"; import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; @@ -71,17 +72,6 @@ export function cleanUpComposerUploadHandler() { uploadHandlers.length = 0; } -let uploadProcessorQueue = []; -let uploadProcessorActions = {}; -export function addComposerUploadProcessor(queueItem, actionItem) { - uploadProcessorQueue.push(queueItem); - Object.assign(uploadProcessorActions, actionItem); -} -export function cleanUpComposerUploadProcessor() { - uploadProcessorQueue = []; - uploadProcessorActions = {}; -} - let uploadPreProcessors = []; export function addComposerUploadPreProcessor(pluginClass, optionsResolverFn) { if (!(pluginClass.prototype instanceof BasePlugin)) { @@ -107,18 +97,22 @@ export function cleanUpComposerUploadMarkdownResolver() { uploadMarkdownResolvers = []; } -export default Component.extend(ComposerUpload, { +export default Component.extend(ComposerUploadUppy, { classNameBindings: ["showToolbar:toolbar-visible", ":wmd-controls"], fileUploadElementId: "file-uploader", mobileFileUploaderId: "mobile-file-upload", + eventPrefix: "composer", + uploadType: "composer", + uppyId: "composer-editor-uppy", + composerModel: alias("composer"), + composerModelContentKey: "reply", + editorInputClass: ".d-editor-input", shouldBuildScrollMap: true, scrollMap: null, processPreview: true, uploadMarkdownResolvers, - uploadProcessorActions, - uploadProcessorQueue, uploadPreProcessors, uploadHandlers, diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js index 016ed8d3bd..9d85a476ba 100644 --- a/app/assets/javascripts/discourse/app/controllers/composer.js +++ b/app/assets/javascripts/discourse/app/controllers/composer.js @@ -296,15 +296,6 @@ export default Controller.extend({ return option; }, - @discourseComputed() - composerComponent() { - const defaultComposer = "composer-editor"; - if (this.siteSettings.enable_experimental_composer_uploader) { - return "composer-editor-uppy"; - } - return defaultComposer; - }, - @discourseComputed("model.requiredCategoryMissing", "model.replyLength") disableTextarea(requiredCategoryMissing, replyLength) { return requiredCategoryMissing && replyLength === 0; diff --git a/app/assets/javascripts/discourse/app/initializers/register-media-optimization-upload-processor.js b/app/assets/javascripts/discourse/app/initializers/register-media-optimization-upload-processor.js index 7b6bfbff65..3f1bfed382 100644 --- a/app/assets/javascripts/discourse/app/initializers/register-media-optimization-upload-processor.js +++ b/app/assets/javascripts/discourse/app/initializers/register-media-optimization-upload-processor.js @@ -1,7 +1,4 @@ -import { - addComposerUploadPreProcessor, - addComposerUploadProcessor, -} from "discourse/components/composer-editor"; +import { addComposerUploadPreProcessor } from "discourse/components/composer-editor"; import UppyMediaOptimization from "discourse/lib/uppy-media-optimization-plugin"; export default { @@ -10,30 +7,18 @@ export default { initialize(container) { let siteSettings = container.lookup("site-settings:main"); if (siteSettings.composer_media_optimization_image_enabled) { - if (!siteSettings.enable_experimental_composer_uploader) { - addComposerUploadProcessor( - { action: "optimizeJPEG" }, - { - optimizeJPEG: (data, opts) => + addComposerUploadPreProcessor( + UppyMediaOptimization, + ({ isMobileDevice }) => { + return { + optimizeFn: (data, opts) => container .lookup("service:media-optimization-worker") .optimizeImage(data, opts), - } - ); - } else { - addComposerUploadPreProcessor( - UppyMediaOptimization, - ({ isMobileDevice }) => { - return { - optimizeFn: (data, opts) => - container - .lookup("service:media-optimization-worker") - .optimizeImage(data, opts), - runParallel: !isMobileDevice, - }; - } - ); - } + runParallel: !isMobileDevice, + }; + } + ); } }, }; diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js index d11adef5f1..12f1b900c2 100644 --- a/app/assets/javascripts/discourse/app/lib/plugin-api.js +++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js @@ -2,7 +2,6 @@ import ComposerEditor, { addComposerUploadHandler, addComposerUploadMarkdownResolver, addComposerUploadPreProcessor, - addComposerUploadProcessor, } from "discourse/components/composer-editor"; import { addButton, @@ -94,8 +93,10 @@ import { CUSTOM_USER_SEARCH_OPTIONS } from "select-kit/components/user-chooser"; import { downloadCalendar } from "discourse/lib/download-calendar"; // If you add any methods to the API ensure you bump up the version number -// based on Semantic Versioning 2.0.0. -const PLUGIN_API_VERSION = "0.14.0"; +// based on Semantic Versioning 2.0.0. Please up the changelog at +// docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md whenever you change the version +// using the format described at https://keepachangelog.com/en/1.0.0/. +const PLUGIN_API_VERSION = "1.0.0"; // This helper prevents us from applying the same `modifyClass` over and over in test mode. function canModify(klass, type, resolverName, changes) { @@ -1021,44 +1022,22 @@ class PluginApi { } /** - * Registers a function to handle uploads for specified file types + * Registers a function to handle uploads for specified file types. * The normal uploading functionality will be bypassed if function returns * a falsy value. - * This only for uploads of individual files * * Example: * - * api.addComposerUploadHandler(["mp4", "mov"], (file, editor) => { - * console.log("Handling upload for", file.name); + * api.addComposerUploadHandler(["mp4", "mov"], (files, editor) => { + * files.forEach((file) => { + * console.log("Handling upload for", file.name); + * }); * }) */ addComposerUploadHandler(extensions, method) { addComposerUploadHandler(extensions, method); } - /** - * Registers a pre-processor for file uploads - * See https://github.com/blueimp/jQuery-File-Upload/wiki/Options#file-processing-options - * - * Useful for transforming to-be uploaded files client-side - * - * Example: - * - * api.addComposerUploadProcessor({action: 'myFileTransformation'}, { - * myFileTransformation(data, options) { - * let p = new Promise((resolve, reject) => { - * let file = data.files[data.index]; - * console.log(`Transforming ${file.name}`); - * // do work... - * resolve(data); - * }); - * return p; - * }); - */ - addComposerUploadProcessor(queueItem, actionItem) { - addComposerUploadProcessor(queueItem, actionItem); - } - /** * Registers a pre-processor for file uploads in the form * of an Uppy preprocessor plugin. diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js index c623a92388..dfd8efd160 100644 --- a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js +++ b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js @@ -549,4 +549,35 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { showUploadSelector(toolbarEvent) { this.send("showUploadSelector", toolbarEvent); }, + + _bindMobileUploadButton() { + if (this.site.mobileView) { + this.mobileUploadButton = document.getElementById( + this.mobileFileUploaderId + ); + this.mobileUploadButtonEventListener = () => { + document.getElementById(this.fileUploadElementId).click(); + }; + this.mobileUploadButton.addEventListener( + "click", + this.mobileUploadButtonEventListener, + false + ); + } + }, + + _unbindMobileUploadButton() { + this.mobileUploadButton?.removeEventListener( + "click", + this.mobileUploadButtonEventListener + ); + }, + + _filenamePlaceholder(data) { + return data.name.replace(/\u200B-\u200D\uFEFF]/g, ""); + }, + + _resetUploadFilenamePlaceholder() { + this.set("uploadFilenamePlaceholder", null); + }, }); diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload.js b/app/assets/javascripts/discourse/app/mixins/composer-upload.js deleted file mode 100644 index cee453f6d0..0000000000 --- a/app/assets/javascripts/discourse/app/mixins/composer-upload.js +++ /dev/null @@ -1,367 +0,0 @@ -import Mixin from "@ember/object/mixin"; -import I18n from "I18n"; -import { next, run } from "@ember/runloop"; -import getURL from "discourse-common/lib/get-url"; -import { clipboardHelpers } from "discourse/lib/utilities"; -import discourseComputed, { - observes, - on, -} from "discourse-common/utils/decorators"; -import { - displayErrorForUpload, - getUploadMarkdown, - validateUploadedFiles, -} from "discourse/lib/uploads"; -import { cacheShortUploadUrl } from "pretty-text/upload-short-url"; -import bootbox from "bootbox"; - -export default Mixin.create({ - _xhr: null, - uploadProgress: 0, - uploadFilenamePlaceholder: null, - uploadProcessingFilename: null, - uploadProcessingPlaceholdersAdded: false, - - @discourseComputed("uploadFilenamePlaceholder") - uploadPlaceholder(uploadFilenamePlaceholder) { - const clipboard = I18n.t("clipboard"); - const filename = uploadFilenamePlaceholder - ? uploadFilenamePlaceholder - : clipboard; - - let placeholder = `[${I18n.t("uploading_filename", { filename })}]()\n`; - if (!this._cursorIsOnEmptyLine()) { - placeholder = `\n${placeholder}`; - } - - return placeholder; - }, - - @observes("composer.uploadCancelled") - _cancelUpload() { - if (!this.get("composer.uploadCancelled")) { - return; - } - this.set("composer.uploadCancelled", false); - - if (this._xhr) { - this._xhr._userCancelled = true; - this._xhr.abort(); - } - this._resetUpload(true); - }, - - _setUploadPlaceholderSend(data) { - const filename = this._filenamePlaceholder(data); - this.set("uploadFilenamePlaceholder", filename); - - // when adding two separate files with the same filename search for matching - // placeholder already existing in the editor ie [Uploading: test.png...] - // and add order nr to the next one: [Uploading: test.png(1)...] - const escapedFilename = filename.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); - const regexString = `\\[${I18n.t("uploading_filename", { - filename: escapedFilename + "(?:\\()?([0-9])?(?:\\))?", - })}\\]\\(\\)`; - const globalRegex = new RegExp(regexString, "g"); - const matchingPlaceholder = this.get("composer.reply").match(globalRegex); - if (matchingPlaceholder) { - // get last matching placeholder and its consecutive nr in regex - // capturing group and apply +1 to the placeholder - const lastMatch = matchingPlaceholder[matchingPlaceholder.length - 1]; - const regex = new RegExp(regexString); - const orderNr = regex.exec(lastMatch)[1] - ? parseInt(regex.exec(lastMatch)[1], 10) + 1 - : 1; - data.orderNr = orderNr; - const filenameWithOrderNr = `${filename}(${orderNr})`; - this.set("uploadFilenamePlaceholder", filenameWithOrderNr); - } - }, - - _setUploadPlaceholderDone(data) { - const filename = this._filenamePlaceholder(data); - - if (data.orderNr) { - const filenameWithOrderNr = `${filename}(${data.orderNr})`; - this.set("uploadFilenamePlaceholder", filenameWithOrderNr); - } else { - this.set("uploadFilenamePlaceholder", filename); - } - }, - - _filenamePlaceholder(data) { - if (data.files) { - return data.files[0].name.replace(/\u200B-\u200D\uFEFF]/g, ""); - } else { - return data.name.replace(/\u200B-\u200D\uFEFF]/g, ""); - } - }, - - _resetUploadFilenamePlaceholder() { - this.set("uploadFilenamePlaceholder", null); - }, - - _resetUpload(removePlaceholder) { - next(() => { - if (this._validUploads > 0) { - this._validUploads--; - } - if (this._validUploads === 0) { - this.setProperties({ - uploadProgress: 0, - isUploading: false, - isCancellable: false, - }); - } - if (removePlaceholder) { - this.appEvents.trigger( - "composer:replace-text", - this.uploadPlaceholder, - "" - ); - } - this._resetUploadFilenamePlaceholder(); - }); - }, - - _bindUploadTarget() { - this._unbindUploadTarget(); // in case it's still bound, let's clean it up first - this._pasted = false; - - const $element = $(this.element); - - this.setProperties({ - uploadProgress: 0, - isUploading: false, - isProcessingUpload: false, - isCancellable: false, - }); - - $.blueimp.fileupload.prototype.processActions = this.uploadProcessorActions; - - $element.fileupload({ - url: getURL(`/uploads.json?client_id=${this.messageBus.clientId}`), - dataType: "json", - pasteZone: $element, - processQueue: this.uploadProcessorQueue, - }); - - $element - .on("fileuploadprocessstart", () => { - this.setProperties({ - uploadProgress: 0, - isUploading: true, - isProcessingUpload: true, - isCancellable: false, - }); - }) - .on("fileuploadprocess", (e, data) => { - if (!this.uploadProcessingPlaceholdersAdded) { - data.originalFiles - .map((f) => f.name) - .forEach((f) => { - this.appEvents.trigger( - "composer:insert-text", - `[${I18n.t("processing_filename", { - filename: f, - })}]()\n` - ); - }); - this.uploadProcessingPlaceholdersAdded = true; - } - this.uploadProcessingFilename = data.files[data.index].name; - }) - .on("fileuploadprocessstop", () => { - this.setProperties({ - uploadProgress: 0, - isUploading: false, - isProcessingUpload: false, - isCancellable: false, - }); - this.uploadProcessingPlaceholdersAdded = false; - }); - - $element.on("fileuploadpaste", (e) => { - this._pasted = true; - - if (!$(".d-editor-input").is(":focus")) { - return; - } - - const { canUpload, canPasteHtml, types } = clipboardHelpers(e, { - siteSettings: this.siteSettings, - canUpload: true, - }); - - if (!canUpload || canPasteHtml || types.includes("text/plain")) { - e.preventDefault(); - } - }); - - $element.on("fileuploadsubmit", (e, data) => { - const max = this.siteSettings.simultaneous_uploads; - const fileCount = data.files.length; - - // Limit the number of simultaneous uploads - if (max > 0 && fileCount > max) { - bootbox.alert( - I18n.t("post.errors.too_many_dragged_and_dropped_files", { - count: max, - }) - ); - return false; - } - - // Look for a matching file upload handler contributed from a plugin - if (fileCount === 1) { - const file = data.files[0]; - const matchingHandler = this._findMatchingUploadHandler(file.name); - if (matchingHandler && !matchingHandler.method(file, this)) { - return false; - } - } - - // If no plugin, continue as normal - const isPrivateMessage = this.get("composer.privateMessage"); - - data.formData = { type: "composer" }; - if (isPrivateMessage) { - data.formData.for_private_message = true; - } - if (this._pasted) { - data.formData.pasted = true; - } - - const opts = { - user: this.currentUser, - siteSettings: this.siteSettings, - isPrivateMessage, - allowStaffToUploadAnyFileInPm: this.siteSettings - .allow_staff_to_upload_any_file_in_pm, - }; - - const isUploading = validateUploadedFiles(data.files, opts); - - run(() => { - this.setProperties({ uploadProgress: 0, isUploading }); - }); - - return isUploading; - }); - - $element.on("fileuploadprogressall", (e, data) => { - run(() => { - this.set( - "uploadProgress", - parseInt((data.loaded / data.total) * 100, 10) - ); - }); - }); - - $element.on("fileuploadsend", (e, data) => { - run(() => { - this._pasted = false; - this._validUploads++; - - this._setUploadPlaceholderSend(data); - - if (this.uploadProcessingFilename) { - this.appEvents.trigger( - "composer:replace-text", - `[${I18n.t("processing_filename", { - filename: this.uploadProcessingFilename, - })}]()`, - this.uploadPlaceholder.trim() - ); - this.uploadProcessingFilename = null; - } else { - this.appEvents.trigger( - "composer:insert-text", - this.uploadPlaceholder - ); - } - - if (data.xhr && data.originalFiles.length === 1) { - this.set("isCancellable", true); - this._xhr = data.xhr(); - } - }); - }); - - $element.on("fileuploaddone", (e, data) => { - run(() => { - let upload = data.result; - this._setUploadPlaceholderDone(data); - if (!this._xhr || !this._xhr._userCancelled) { - const markdown = this.uploadMarkdownResolvers.reduce( - (md, resolver) => resolver(upload) || md, - getUploadMarkdown(upload) - ); - - cacheShortUploadUrl(upload.short_url, upload); - this.appEvents.trigger( - "composer:replace-text", - this.uploadPlaceholder.trim(), - markdown - ); - this._resetUpload(false); - } else { - this._resetUpload(true); - } - }); - }); - - $element.on("fileuploadfail", (e, data) => { - run(() => { - this._setUploadPlaceholderDone(data); - this._resetUpload(true); - - const userCancelled = this._xhr && this._xhr._userCancelled; - this._xhr = null; - - if (!userCancelled) { - displayErrorForUpload(data, this.siteSettings, data.files[0].name); - } - }); - }); - }, - - _bindMobileUploadButton() { - if (this.site.mobileView) { - this.mobileUploadButton = document.getElementById( - this.mobileFileUploaderId - ); - this.mobileUploadButtonEventListener = () => { - document.getElementById(this.fileUploadElementId).click(); - }; - this.mobileUploadButton.addEventListener( - "click", - this.mobileUploadButtonEventListener, - false - ); - } - }, - - _unbindMobileUploadButton() { - this.mobileUploadButton?.removeEventListener( - "click", - this.mobileUploadButtonEventListener - ); - }, - - @on("willDestroyElement") - _unbindUploadTarget() { - this._validUploads = 0; - const $uploadTarget = $(this.element); - try { - $uploadTarget.fileupload("destroy"); - } catch (e) { - /* wasn't initialized yet */ - } - $uploadTarget.off(); - }, - - showUploadSelector(toolbarEvent) { - this.send("showUploadSelector", toolbarEvent); - }, -}); diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs index 26f8f21b32..e1c50bc71b 100644 --- a/app/assets/javascripts/discourse/app/templates/composer.hbs +++ b/app/assets/javascripts/discourse/app/templates/composer.hbs @@ -111,7 +111,7 @@
- {{component composerComponent + {{composer-editor topic=topic composer=model lastValidatedAt=lastValidatedAt diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js deleted file mode 100644 index 37ed65aca3..0000000000 --- a/app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js +++ /dev/null @@ -1,326 +0,0 @@ -import { - acceptance, - exists, - query, - queryAll, -} from "discourse/tests/helpers/qunit-helpers"; -import { withPluginApi } from "discourse/lib/plugin-api"; -import { click, fillIn, visit } from "@ember/test-helpers"; -import bootbox from "bootbox"; -import { test } from "qunit"; - -function pretender(server, helper) { - server.post("/uploads/lookup-urls", () => { - return helper.response([ - { - short_url: "upload://asdsad.png", - url: "/secure-media-uploads/default/3X/1/asjdiasjdiasida.png", - short_path: "/uploads/short-url/asdsad.png", - }, - ]); - }); -} - -async function writeInComposer(assert) { - await visit("/t/internationalization-localization/280"); - await click("#topic-footer-buttons .btn.create"); - - await fillIn(".d-editor-input", "[test](upload://abcdefg.png)"); - - assert.strictEqual( - queryAll(".d-editor-preview:visible").html().trim(), - '

test

' - ); - - await fillIn(".d-editor-input", "[test|attachment](upload://asdsad.png)"); -} - -acceptance("Composer Attachment - Cooking", function (needs) { - needs.user(); - needs.pretender(pretender); - - test("attachments are cooked properly", async function (assert) { - await writeInComposer(assert); - assert.strictEqual( - queryAll(".d-editor-preview:visible").html().trim(), - '

test

' - ); - }); -}); - -acceptance("Composer Attachment - Secure Media Enabled", function (needs) { - needs.user(); - needs.settings({ secure_media: true }); - needs.pretender(pretender); - - test("attachments are cooked properly when secure media is enabled", async function (assert) { - await writeInComposer(assert); - assert.strictEqual( - queryAll(".d-editor-preview:visible").html().trim(), - '

test

' - ); - }); -}); - -acceptance("Composer Attachment - Upload Placeholder", function (needs) { - needs.user(); - - test("should insert a newline before and after an image when pasting into an empty composer", async function (assert) { - await visit("/"); - await click("#create-topic"); - const image = createImage("avatar.png", "/images/avatar.png?1", 200, 300); - - await queryAll(".wmd-controls").trigger("fileuploadsend", image); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "[Uploading: avatar.png...]()\n" - ); - - await queryAll(".wmd-controls").trigger("fileuploaddone", image); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "![avatar|200x300](/images/avatar.png?1)\n" - ); - }); - - test("should insert a newline after an image when pasting into a blank line", async function (assert) { - await visit("/"); - await click("#create-topic"); - await fillIn(".d-editor-input", "The image:\n"); - - const image = createImage("avatar.png", "/images/avatar.png?1", 200, 300); - await queryAll(".wmd-controls").trigger("fileuploadsend", image); - - assert.strictEqual( - queryAll(".d-editor-input").val(), - "The image:\n[Uploading: avatar.png...]()\n" - ); - - await queryAll(".wmd-controls").trigger("fileuploaddone", image); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "The image:\n![avatar|200x300](/images/avatar.png?1)\n" - ); - }); - - test("should insert a newline before and after an image when pasting into a non blank line", async function (assert) { - await visit("/"); - await click("#create-topic"); - await fillIn(".d-editor-input", "The image:"); - - const image = createImage("avatar.png", "/images/avatar.png?1", 200, 300); - await queryAll(".wmd-controls").trigger("fileuploadsend", image); - - assert.strictEqual( - queryAll(".d-editor-input").val(), - "The image:\n[Uploading: avatar.png...]()\n" - ); - - await queryAll(".wmd-controls").trigger("fileuploaddone", image); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "The image:\n![avatar|200x300](/images/avatar.png?1)\n" - ); - }); - - test("should insert a newline before and after an image when pasting with cursor in the middle of the line", async function (assert) { - await visit("/"); - await click("#create-topic"); - await fillIn(".d-editor-input", "The image Text after the image."); - const textArea = query(".d-editor-input"); - textArea.selectionStart = 10; - textArea.selectionEnd = 10; - - const image = createImage("avatar.png", "/images/avatar.png?1", 200, 300); - await queryAll(".wmd-controls").trigger("fileuploadsend", image); - - assert.strictEqual( - queryAll(".d-editor-input").val(), - "The image \n[Uploading: avatar.png...]()\nText after the image." - ); - - await queryAll(".wmd-controls").trigger("fileuploaddone", image); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "The image \n![avatar|200x300](/images/avatar.png?1)\nText after the image." - ); - }); - - test("should insert a newline before and after an image when pasting with text selected", async function (assert) { - await visit("/"); - await click("#create-topic"); - const image = createImage("avatar.png", "/images/avatar.png?1", 200, 300); - await fillIn( - ".d-editor-input", - "The image [paste here] Text after the image." - ); - const textArea = query(".d-editor-input"); - textArea.selectionStart = 10; - textArea.selectionEnd = 23; - - await queryAll(".wmd-controls").trigger("fileuploadsend", image); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "The image \n[Uploading: avatar.png...]()\n Text after the image." - ); - - await queryAll(".wmd-controls").trigger("fileuploaddone", image); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "The image \n![avatar|200x300](/images/avatar.png?1)\n Text after the image." - ); - }); - - test("pasting several images", async function (assert) { - await visit("/"); - await click("#create-topic"); - - const image1 = createImage("test.png", "/images/avatar.png?1", 200, 300); - const image2 = createImage("test.png", "/images/avatar.png?2", 100, 200); - const image3 = createImage("image.png", "/images/avatar.png?3", 300, 400); - const image4 = createImage("image.png", "/images/avatar.png?4", 300, 400); - - await queryAll(".wmd-controls").trigger("fileuploadsend", image1); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "[Uploading: test.png...]()\n" - ); - - await queryAll(".wmd-controls").trigger("fileuploadsend", image2); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "[Uploading: test.png...]()\n[Uploading: test.png(1)...]()\n" - ); - - await queryAll(".wmd-controls").trigger("fileuploadsend", image4); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "[Uploading: test.png...]()\n[Uploading: test.png(1)...]()\n[Uploading: image.png...]()\n" - ); - - await queryAll(".wmd-controls").trigger("fileuploadsend", image3); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "[Uploading: test.png...]()\n[Uploading: test.png(1)...]()\n[Uploading: image.png...]()\n[Uploading: image.png(1)...]()\n" - ); - - await queryAll(".wmd-controls").trigger("fileuploaddone", image2); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "[Uploading: test.png...]()\n![test|100x200](/images/avatar.png?2)\n[Uploading: image.png...]()\n[Uploading: image.png(1)...]()\n" - ); - - await queryAll(".wmd-controls").trigger("fileuploaddone", image3); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "[Uploading: test.png...]()\n![test|100x200](/images/avatar.png?2)\n[Uploading: image.png...]()\n![image|300x400](/images/avatar.png?3)\n" - ); - - await queryAll(".wmd-controls").trigger("fileuploaddone", image1); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "![test|200x300](/images/avatar.png?1)\n![test|100x200](/images/avatar.png?2)\n[Uploading: image.png...]()\n![image|300x400](/images/avatar.png?3)\n" - ); - }); - - test("should accept files with unescaped characters", async function (assert) { - await visit("/"); - await click("#create-topic"); - - const image = createImage("ima++ge.png", "/images/avatar.png?4", 300, 400); - - await queryAll(".wmd-controls").trigger("fileuploadsend", image); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "[Uploading: ima++ge.png...]()\n" - ); - - await queryAll(".wmd-controls").trigger("fileuploaddone", image); - assert.strictEqual( - queryAll(".d-editor-input").val(), - "![ima++ge|300x400](/images/avatar.png?4)\n" - ); - }); -}); - -function createImage(name, url, width, height) { - const file = new Blob([""], { type: "image/png" }); - file.name = name; - return { - files: [file], - result: { - original_filename: name, - thumbnail_width: width, - thumbnail_height: height, - url, - }, - }; -} - -acceptance("Composer Attachment - Upload Handler", function (needs) { - needs.user(); - needs.hooks.beforeEach(() => { - withPluginApi("0.8.14", (api) => { - api.addComposerUploadHandler(["png"], (file) => { - bootbox.alert(`This is an upload handler test for ${file.name}`); - }); - }); - }); - - test("should handle a single file being uploaded with the extension handler", async function (assert) { - await visit("/"); - await click("#create-topic"); - const image = createImage( - "handlertest.png", - "/images/avatar.png?1", - 200, - 300 - ); - await fillIn(".d-editor-input", "This is a handler test."); - - await queryAll(".wmd-controls").trigger("fileuploadsubmit", image); - assert.strictEqual( - queryAll(".bootbox .modal-body").html(), - "This is an upload handler test for handlertest.png", - "it should show the bootbox triggered by the upload handler" - ); - await click(".modal-footer .btn"); - }); -}); - -acceptance("Composer Attachment - File input", function (needs) { - needs.user(); - - test("shouldn't add to DOM the hidden file input if uploads aren't allowed", async function (assert) { - this.siteSettings.authorized_extensions = ""; - await visit("/"); - await click("#create-topic"); - - assert.notOk(exists("input#file-uploader")); - }); - - test("should fill the accept attribute with allowed file extensions", async function (assert) { - this.siteSettings.authorized_extensions = "jpg|jpeg|png"; - await visit("/"); - await click("#create-topic"); - - assert.ok(exists("input#file-uploader"), "An input is rendered"); - assert.strictEqual( - query("input#file-uploader").accept, - ".jpg,.jpeg,.png", - "Accepted values are correct" - ); - }); - - test("the hidden file input shouldn't have the accept attribute if any file extension is allowed", async function (assert) { - this.siteSettings.authorized_extensions = "jpg|jpeg|png|*"; - await visit("/"); - await click("#create-topic"); - - assert.ok(exists("input#file-uploader"), "An input is rendered"); - assert.notOk( - query("input#file-uploader").hasAttribute("accept"), - "The input doesn't contain the accept attribute" - ); - }); -}); diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js index 6671bc8a92..622fe159ed 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js @@ -59,7 +59,6 @@ acceptance("Uppy Composer Attachment - Upload Placeholder", function (needs) { needs.user(); needs.pretender(pretender); needs.settings({ - enable_experimental_composer_uploader: true, simultaneous_uploads: 2, }); @@ -197,7 +196,6 @@ acceptance("Uppy Composer Attachment - Upload Error", function (needs) { }); }); needs.settings({ - enable_experimental_composer_uploader: true, simultaneous_uploads: 2, }); @@ -229,7 +227,6 @@ acceptance("Uppy Composer Attachment - Upload Handler", function (needs) { needs.user(); needs.pretender(pretender); needs.settings({ - enable_experimental_composer_uploader: true, simultaneous_uploads: 2, }); needs.hooks.beforeEach(() => { diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js index 956deeb0de..58410713f6 100644 --- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js +++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js @@ -48,7 +48,6 @@ import { cleanUpComposerUploadHandler, cleanUpComposerUploadMarkdownResolver, cleanUpComposerUploadPreProcessor, - cleanUpComposerUploadProcessor, } from "discourse/components/composer-editor"; import { resetLastEditNotificationClick } from "discourse/models/post-stream"; import { clearAuthMethods } from "discourse/models/login-method"; @@ -294,7 +293,6 @@ export function acceptance(name, optionsOrCallback) { setTopicList(null); _clearSnapshots(); cleanUpComposerUploadHandler(); - cleanUpComposerUploadProcessor(); cleanUpComposerUploadMarkdownResolver(); cleanUpComposerUploadPreProcessor(); clearTopicFooterDropdowns(); diff --git a/config/site_settings.yml b/config/site_settings.yml index d82c83144a..f2019ac435 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -267,6 +267,8 @@ basic: client: true default: true hidden: true + # TODO (martin) (2022-02-01) Remove this setting once plugins relying on + # it have been changed. enable_experimental_composer_uploader: client: true default: false diff --git a/docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md b/docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md new file mode 100644 index 0000000000..7ded201f97 --- /dev/null +++ b/docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md @@ -0,0 +1,30 @@ +# Changelog + +All notable changes to the Discourse JavaScript plugin API located at +app/assets/javascripts/discourse/app/lib/plugin-api.js will be described +in this file.. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [1.0.0] - 2021-11-25 +### Removed +- Removes the `addComposerUploadProcessor` function, which is no longer used in +favour of `addComposerUploadPreProcessor`. The former was used to add preprocessors +for client side uploads via jQuery file uploader (described at +https://github.com/blueimp/jQuery-File-Upload/wiki/Options#file-processing-options). +The new `addComposerUploadPreProcessor` adds preprocessors for client side +uploads in the form of an Uppy plugin. See https://uppy.io/docs/writing-plugins/ +for the Uppy documentation, but other examples of preprocessors in core can be found +in the UppyMediaOptimization and UppyChecksum classes. This has been done because +of the overarching move towards Uppy in the Discourse codebase rather than +jQuery fileupload, which will eventually be removed altogether as a broader effort +to remove jQuery from the codebase. + +### Changed +- Changes `addComposerUploadHandler`'s behaviour. Instead of being only usable +for single files at a time, now multiple files are sent to the upload handler +at once. These multiple files are sent based on the groups in which they are +added (e.g. multiple files selected from the system upload dialog, or multiple +files dropped in to the composer). Files will be sent in buckets to the handlers +they match. From 7e5f52a163c145a3cd26a38e7a823b1067724d4b Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Tue, 30 Nov 2021 10:42:45 +1000 Subject: [PATCH 142/168] DEV: Use pushObject for inProgressUploads in uppy (#15134) The inProgressUploads is meant to be used to display these uploads in a UI, and Ember will only update the array in the UI if pushObject is used to notify it. --- .../javascripts/discourse/app/mixins/composer-upload-uppy.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js index dfd8efd160..f9247eadc6 100644 --- a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js +++ b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js @@ -263,7 +263,10 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, { }); files.forEach((file) => { - this.inProgressUploads.push( + // The inProgressUploads is meant to be used to display these uploads + // in a UI, and Ember will only update the array in the UI if pushObject + // is used to notify it. + this.inProgressUploads.pushObject( EmberObject.create({ fileName: file.name, id: file.id, From 6662101208089def86ed18a81ac90d1c52670569 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 30 Nov 2021 03:45:26 +0100 Subject: [PATCH 143/168] DEV: Fix a test leak (#15135) The leak was introduced in #11722 and a test was added that relied on it in #14563 This PR fixes the leak (bookmarks-test), fixes the test that relied on it (fast-edit-test), and repleces some ad-hoc code with cloneJSON helper (other files) --- .../tests/acceptance/bookmarks-test.js | 3 ++- .../tests/acceptance/fast-edit-test.js | 19 +++++++++++++------ .../tests/acceptance/flag-post-test.js | 3 +-- .../tests/acceptance/user-card-test.js | 3 ++- .../tests/unit/models/user-badge-test.js | 5 +++-- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js b/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js index 5f8a186eb9..aae3996900 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js @@ -10,6 +10,7 @@ import I18n from "I18n"; import selectKit from "discourse/tests/helpers/select-kit-helper"; import { test } from "qunit"; import topicFixtures from "discourse/tests/fixtures/topic"; +import { cloneJSON } from "discourse-common/lib/object"; async function openBookmarkModal(postNumber = 1) { if (exists(`#post_${postNumber} button.show-more-actions`)) { @@ -58,7 +59,7 @@ async function testTopicLevelBookmarkButtonIcon(assert, postNumber) { acceptance("Bookmarking", function (needs) { needs.user(); - const topicResponse = topicFixtures["/t/280/1.json"]; + const topicResponse = cloneJSON(topicFixtures["/t/280/1.json"]); topicResponse.post_stream.posts[0].cooked += ` diff --git a/app/assets/javascripts/discourse/tests/acceptance/fast-edit-test.js b/app/assets/javascripts/discourse/tests/acceptance/fast-edit-test.js index 3d7b05b887..0485dbd73b 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/fast-edit-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/fast-edit-test.js @@ -1,29 +1,36 @@ import { acceptance, exists, - queryAll, + query, selectText, } from "discourse/tests/helpers/qunit-helpers"; import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers"; import { test } from "qunit"; +import postFixtures from "discourse/tests/fixtures/post"; +import { cloneJSON } from "discourse-common/lib/object"; acceptance("Fast Edit", function (needs) { needs.user(); needs.settings({ enable_fast_edit: true, }); + needs.pretender((server, helper) => { + server.get("/posts/419", () => { + return helper.response(cloneJSON(postFixtures["/posts/398"])); + }); + }); test("Fast edit button works", async function (assert) { await visit("/t/internationalization-localization/280"); - const textNode = document.querySelector("#post_1 .cooked p").childNodes[0]; + const textNode = query("#post_1 .cooked p").childNodes[0]; await selectText(textNode, 9); await click(".quote-button .quote-edit-label"); assert.ok(exists("#fast-edit-input"), "fast editor is open"); assert.strictEqual( - queryAll("#fast-edit-input").val(), + query("#fast-edit-input").value, "Any plans", "contains selected text" ); @@ -37,14 +44,14 @@ acceptance("Fast Edit", function (needs) { test("Works with keyboard shortcut", async function (assert) { await visit("/t/internationalization-localization/280"); - const textNode = document.querySelector("#post_1 .cooked p").childNodes[0]; + const textNode = query("#post_1 .cooked p").childNodes[0]; await selectText(textNode, 9); await triggerKeyEvent(document, "keypress", "e".charCodeAt(0)); assert.ok(exists("#fast-edit-input"), "fast editor is open"); assert.strictEqual( - queryAll("#fast-edit-input").val(), + query("#fast-edit-input").value, "Any plans", "contains selected text" ); @@ -58,7 +65,7 @@ acceptance("Fast Edit", function (needs) { test("Opens full composer for multi-line selection", async function (assert) { await visit("/t/internationalization-localization/280"); - const textNode = document.querySelector("#post_1 .cooked"); + const textNode = query("#post_2 .cooked"); await selectText(textNode); await click(".quote-button .quote-edit-label"); diff --git a/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js b/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js index 575685e95e..ded890b5dd 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js @@ -29,9 +29,8 @@ function pressEnter(element, modifier) { acceptance("flagging", function (needs) { needs.user(); needs.pretender((server, helper) => { - const userResponse = Object.assign({}, userFixtures["/u/charlie.json"]); server.get("/u/uwe_keim.json", () => { - return helper.response(userResponse); + return helper.response(userFixtures["/u/charlie.json"]); }); server.get("/admin/users/255.json", () => { return helper.response({ diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js index 2e9281f368..4b4a0c1aa3 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js @@ -3,12 +3,13 @@ import { click, visit } from "@ember/test-helpers"; import User from "discourse/models/user"; import { test } from "qunit"; import userFixtures from "discourse/tests/fixtures/user-fixtures"; +import { cloneJSON } from "discourse-common/lib/object"; acceptance("User Card - Show Local Time", function (needs) { needs.user(); needs.settings({ display_local_time_in_user_card: true }); needs.pretender((server, helper) => { - let cardResponse = Object.assign({}, userFixtures["/u/charlie/card.json"]); + const cardResponse = cloneJSON(userFixtures["/u/charlie/card.json"]); delete cardResponse.user.timezone; server.get("/u/charlie/card.json", () => helper.response(cardResponse)); }); diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js index eed1f62191..f316a69116 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js @@ -1,11 +1,12 @@ import { module, test } from "qunit"; import UserBadge from "discourse/models/user-badge"; import badgeFixtures from "discourse/tests/fixtures/user-badges"; +import { cloneJSON } from "discourse-common/lib/object"; module("Unit | Model | user-badge", function () { test("createFromJson single", function (assert) { const userBadge = UserBadge.createFromJson( - JSON.parse(JSON.stringify(badgeFixtures["/user_badges"])) + cloneJSON(badgeFixtures["/user_badges"]) ); assert.ok(!Array.isArray(userBadge), "does not return an array"); assert.strictEqual( @@ -27,7 +28,7 @@ module("Unit | Model | user-badge", function () { test("createFromJson array", function (assert) { const userBadges = UserBadge.createFromJson( - JSON.parse(JSON.stringify(badgeFixtures["/user-badges/:username"])) + cloneJSON(badgeFixtures["/user-badges/:username"]) ); assert.ok(Array.isArray(userBadges), "returns an array"); assert.strictEqual( From af4b8d0e21f823463a1f8a613aedf9bc845a62e1 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 30 Nov 2021 04:38:19 +0000 Subject: [PATCH 144/168] DEV: Automatically leave PresenceChannels when in the background (#15047) * DEV: Improve PresenceChannel state storage Replaces some objects with Maps, and removes the redundant _presentChannels Set. * DEV: Automatically leave PresenceChannels when in the background If a tab has been in the background for 10s, or there has been no user activity for 60s, then the user will be removed from all PresenceChannels until activity resumes. Developers can opt-out of this by passing `{onlyWhileActive: false}` to the `enter` method. --- .../discourse/app/services/presence.js | 96 +++++++++++++------ .../tests/unit/services/presence-test.js | 52 ++++++++++ 2 files changed, 119 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/discourse/app/services/presence.js b/app/assets/javascripts/discourse/app/services/presence.js index 0915ce2684..e0b8dae8e4 100644 --- a/app/assets/javascripts/discourse/app/services/presence.js +++ b/app/assets/javascripts/discourse/app/services/presence.js @@ -15,6 +15,10 @@ import Session from "discourse/models/session"; import { Promise } from "rsvp"; import { isLegacyEmber, isTesting } from "discourse-common/config/environment"; import User from "discourse/models/user"; +import userPresent, { + onPresenceChange, + removeOnPresenceChange, +} from "discourse/lib/user-presence"; const PRESENCE_INTERVAL_S = 30; const PRESENCE_DEBOUNCE_MS = isTesting() ? 0 : 500; @@ -22,6 +26,11 @@ const PRESENCE_THROTTLE_MS = isTesting() ? 0 : 1000; const PRESENCE_GET_RETRY_MS = 5000; +const USER_PRESENCE_ARGS = { + userUnseenTime: 60000, + browserHiddenTime: 10000, +}; + function createPromiseProxy() { const promiseProxy = {}; promiseProxy.promise = new Promise((resolve, reject) => { @@ -51,7 +60,11 @@ class PresenceChannel extends EmberObject { } // Mark the current user as 'present' in this channel - async enter() { + // By default, the user will temporarily 'leave' the channel when + // the current tab is in the background, or has no interaction for more than 60 seconds. + // To override this behaviour, set onlyWhileActive: false + async enter({ onlyWhileActive = true } = {}) { + this.setProperties({ onlyWhileActive }); await this.presenceService._enter(this); this.set("present", true); } @@ -221,20 +234,32 @@ class PresenceChannelState extends EmberObject { export default class PresenceService extends Service { init() { super.init(...arguments); - this._presentChannels = new Set(); this._queuedEvents = []; this._presenceChannelStates = EmberObject.create(); - this._presentProxies = {}; - this._subscribedProxies = {}; - this._initialDataRequests = {}; + this._presentProxies = new Map(); + this._subscribedProxies = new Map(); + this._initialDataRequests = new Map(); - this._beforeUnloadCallback = () => this._beaconLeaveAll(); - window.addEventListener("beforeunload", this._beforeUnloadCallback); + if (this.currentUser) { + this._beforeUnloadCallback = () => this._beaconLeaveAll(); + window.addEventListener("beforeunload", this._beforeUnloadCallback); + + this._presenceChangeCallback = () => this._throttledUpdateServer(); + onPresenceChange({ + ...USER_PRESENCE_ARGS, + callback: this._presenceChangeCallback, + }); + } + } + + get _presentChannels() { + return new Set(this._presentProxies.keys()); } willDestroy() { super.willDestroy(...arguments); window.removeEventListener("beforeunload", this._beforeUnloadCallback); + removeOnPresenceChange(this._presenceChangeCallback); } // Get a PresenceChannel object representing a single channel @@ -305,34 +330,39 @@ export default class PresenceService extends Service { } _addPresent(channelProxy) { - let present = this._presentProxies[channelProxy.name]; + let present = this._presentProxies.get(channelProxy.name); if (!present) { - present = this._presentProxies[channelProxy.name] = new Set(); + present = new Set(); + this._presentProxies.set(channelProxy.name, present); } present.add(channelProxy); return present.size; } _removePresent(channelProxy) { - let present = this._presentProxies[channelProxy.name]; + let present = this._presentProxies.get(channelProxy.name); present?.delete(channelProxy); + if (present?.size === 0) { + this._presentProxies.delete(channelProxy.name); + } return present?.size || 0; } _addSubscribed(channelProxy) { - let subscribed = this._subscribedProxies[channelProxy.name]; + let subscribed = this._subscribedProxies.get(channelProxy.name); if (!subscribed) { - subscribed = this._subscribedProxies[channelProxy.name] = new Set(); + subscribed = new Set(); + this._subscribedProxies.set(channelProxy.name, subscribed); } subscribed.add(channelProxy); return subscribed.size; } _removeSubscribed(channelProxy) { - let subscribed = this._subscribedProxies[channelProxy.name]; + let subscribed = this._subscribedProxies.get(channelProxy.name); subscribed?.delete(channelProxy); if (subscribed?.size === 0) { - delete this._subscribedProxies[channelProxy.name]; + this._subscribedProxies.delete(channelProxy.name); } return subscribed?.size || 0; } @@ -342,18 +372,15 @@ export default class PresenceService extends Service { throw "Must be logged in to enter presence channel"; } - this._addPresent(channelProxy); - - const channelName = channelProxy.name; - if (this._presentChannels.has(channelName)) { + const newCount = this._addPresent(channelProxy); + if (newCount > 1) { return; } const promiseProxy = createPromiseProxy(); - this._presentChannels.add(channelName); this._queuedEvents.push({ - channel: channelName, + channel: channelProxy.name, type: "enter", promiseProxy, }); @@ -373,16 +400,10 @@ export default class PresenceService extends Service { return; } - const channelName = channelProxy.name; - if (!this._presentChannels.has(channelName)) { - return; - } - const promiseProxy = createPromiseProxy(); - this._presentChannels.delete(channelName); this._queuedEvents.push({ - channel: channelName, + channel: channelProxy.name, type: "leave", promiseProxy, }); @@ -464,14 +485,31 @@ export default class PresenceService extends Service { this._queuedEvents = []; try { + const presentChannels = []; const channelsToLeave = queue .filter((e) => e.type === "leave") .map((e) => e.channel); + const userIsPresent = userPresent(USER_PRESENCE_ARGS); + for (const [channelName, proxies] of this._presentProxies) { + if ( + !userIsPresent && + Array.from(proxies).every((p) => p.onlyWhileActive) + ) { + channelsToLeave.push(channelName); + } else { + presentChannels.push(channelName); + } + } + + if (queue.length === 0 && presentChannels.length === 0) { + return; + } + const response = await ajax("/presence/update", { data: { client_id: this.messageBus.clientId, - present_channels: [...this._presentChannels], + present_channels: presentChannels, leave_channels: channelsToLeave, }, type: "POST", @@ -539,7 +577,7 @@ export default class PresenceService extends Service { debounce(this, this._throttledUpdateServer, PRESENCE_DEBOUNCE_MS); } else if ( !this._nextUpdateTimer && - this._presentChannels.size > 0 && + this._presentChannels.length > 0 && !isTesting() ) { this._nextUpdateTimer = later( diff --git a/app/assets/javascripts/discourse/tests/unit/services/presence-test.js b/app/assets/javascripts/discourse/tests/unit/services/presence-test.js index d5b0d97f7d..f8f63a61c5 100644 --- a/app/assets/javascripts/discourse/tests/unit/services/presence-test.js +++ b/app/assets/javascripts/discourse/tests/unit/services/presence-test.js @@ -4,6 +4,7 @@ import { } from "discourse/tests/helpers/qunit-helpers"; import { test } from "qunit"; import { PresenceChannelNotFound } from "discourse/services/presence"; +import { setTestPresence } from "discourse/lib/user-presence"; function usersFixture() { return [ @@ -326,4 +327,55 @@ acceptance("Presence - Entering and Leaving", function (needs) { "service shows absent" ); }); + + test("handles the onlyWhileActive flag", async function (assert) { + const presenceService = this.container.lookup("service:presence"); + const channel = presenceService.getChannel("/test/ch1"); + await channel.enter(); + requests.pop(); // Throw away this request + + const channel2 = presenceService.getChannel("/test/ch2"); + await channel2.enter({ onlyWhileActive: false }); + + assert.strictEqual(requests.length, 1, "updated the server"); + let presentChannels = requests.pop().getAll("present_channels[]"); + assert.deepEqual( + presentChannels, + ["/test/ch1", "/test/ch2"], + "included both channels when active" + ); + + setTestPresence(false); + await presenceService._updateServer(); + assert.strictEqual( + requests.length, + 1, + "updated the server after going idle" + ); + let request = requests.pop(); + assert.deepEqual( + request.getAll("present_channels[]"), + ["/test/ch2"], + "ch2 remained present" + ); + assert.ok( + request.getAll("leave_channels[]").includes("/test/ch1"), + "left ch1" + ); + + await channel2.leave(); + assert.strictEqual(requests.length, 1, "updated the server"); + request = requests.pop(); + assert.ok( + request.getAll("leave_channels[]").includes("/test/ch2"), + "left ch2" + ); + + await presenceService._updateServer(); + assert.strictEqual( + requests.length, + 0, + "skips sending empty updates to the server" + ); + }); }); From 0edacbd8f7f2bf153f11fc8f7579b30ba7f368c6 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Tue, 30 Nov 2021 12:55:45 +0800 Subject: [PATCH 145/168] DEV: Load fabricators for plugins automatically. (#15106) --- spec/rails_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 3c7b68d79e..16fbbb1a37 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -84,6 +84,10 @@ if ENV['LOAD_PLUGINS'] == "1" Dir[Rails.root.join("plugins/*/spec/plugin_helper.rb")].each do |f| require f end + + Dir[Rails.root.join("plugins/*/spec/fabricators/**/*.rb")].each do |f| + require f + end end # let's not run seed_fu every test From 9896fc7d33811e14ee5d8a8eabd69c58c6e5ba86 Mon Sep 17 00:00:00 2001 From: Jeff Wong Date: Mon, 29 Nov 2021 19:40:54 -1000 Subject: [PATCH 146/168] FIX: allow staff to upload when they should and authorized_extensions is blank (#15136) Allow staff to upload when authorized_extensions is blank, but authorized_extensions_for_staff is not --- app/assets/javascripts/discourse/app/lib/uploads.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/lib/uploads.js b/app/assets/javascripts/discourse/app/lib/uploads.js index dc1f9605a5..ba3a214b9f 100644 --- a/app/assets/javascripts/discourse/app/lib/uploads.js +++ b/app/assets/javascripts/discourse/app/lib/uploads.js @@ -202,7 +202,11 @@ export function authorizesOneOrMoreExtensions(staff, siteSettings) { return ( siteSettings.authorized_extensions.split("|").filter((ext) => ext).length > - 0 + 0 || + (siteSettings.authorized_extensions_for_staff + .split("|") + .filter((ext) => ext).length > 0 && + staff) ); } From 7bd3986b215c033f989e3bc8aa76328b42dcb821 Mon Sep 17 00:00:00 2001 From: Osama Sayegh Date: Tue, 30 Nov 2021 12:55:25 +0300 Subject: [PATCH 147/168] FEATURE: Replace `Crawl-delay` directive with proper rate limiting (#15131) We have a couple of site setting, `slow_down_crawler_user_agents` and `slow_down_crawler_rate`, that are meant to allow site owners to signal to specific crawlers that they're crawling the site too aggressively and that they should slow down. When a crawler is added to the `slow_down_crawler_user_agents` setting, Discourse currently adds a `Crawl-delay` directive for that crawler in `/robots.txt`. Unfortunately, many crawlers don't support the `Crawl-delay` directive in `/robots.txt` which leaves the site owners no options if a crawler is crawling the site too aggressively. This PR replaces the `Crawl-delay` directive with proper rate limiting for crawlers added to the `slow_down_crawler_user_agents` list. On every request made by a non-logged in user, Discourse will check the User Agent string and if it contains one of the values of the `slow_down_crawler_user_agents` list, Discourse will only allow 1 request every N seconds for that User Agent (N is the value of the `slow_down_crawler_rate` setting) and the rest of requests made within the same interval will get a 429 response. The `slow_down_crawler_user_agents` setting becomes quite dangerous with this PR since it could rate limit lots if not all of anonymous traffic if the setting is not used appropriately. So to protect against this scenario, we've added a couple of new validations to the setting when it's changed: 1) each value added to setting must 3 characters or longer 2) each value cannot be a substring of tokens found in popular browser User Agent. The current list of prohibited values is: apple, windows, linux, ubuntu, gecko, firefox, chrome, safari, applewebkit, webkit, mozilla, macintosh, khtml, intel, osx, os x, iphone, ipad and mac. --- app/controllers/application_controller.rb | 24 ++++++++ app/controllers/robots_txt_controller.rb | 10 ---- app/views/robots_txt/index.erb | 3 - config/locales/server.en.yml | 4 +- lib/site_settings/validations.rb | 38 ++++++++++++ spec/lib/site_settings/validations_spec.rb | 61 ++++++++++++++++++++ spec/requests/application_controller_spec.rb | 58 +++++++++++++++++++ spec/requests/robots_txt_controller_spec.rb | 11 ---- 8 files changed, 184 insertions(+), 25 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8d1494136e..1351d76037 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -29,6 +29,7 @@ class ApplicationController < ActionController::Base end end + before_action :rate_limit_crawlers before_action :check_readonly_mode before_action :handle_theme before_action :set_current_user_for_logs @@ -958,4 +959,27 @@ class ApplicationController < ActionController::Base ids = Theme.transform_ids(id) Theme.where(id: ids).pluck(:id, :name).to_h.to_json end + + def rate_limit_crawlers + return if current_user.present? + return if SiteSetting.slow_down_crawler_user_agents.blank? + + user_agent = request.user_agent&.downcase + return if user_agent.blank? + + SiteSetting.slow_down_crawler_user_agents.downcase.split("|").each do |crawler| + if user_agent.include?(crawler) + key = "#{crawler}_crawler_rate_limit" + limiter = RateLimiter.new( + nil, + key, + 1, + SiteSetting.slow_down_crawler_rate, + error_code: key + ) + limiter.performed! + break + end + end + end end diff --git a/app/controllers/robots_txt_controller.rb b/app/controllers/robots_txt_controller.rb index ad9b8e5e8c..4bc2c449d3 100644 --- a/app/controllers/robots_txt_controller.rb +++ b/app/controllers/robots_txt_controller.rb @@ -84,16 +84,6 @@ class RobotsTxtController < ApplicationController result[:agents] << { name: 'Googlebot', disallow: deny_paths_googlebot } end - if SiteSetting.slow_down_crawler_user_agents.present? - SiteSetting.slow_down_crawler_user_agents.split('|').each do |agent| - result[:agents] << { - name: agent, - delay: SiteSetting.slow_down_crawler_rate, - disallow: deny_paths - } - end - end - result end end diff --git a/app/views/robots_txt/index.erb b/app/views/robots_txt/index.erb index f1a8db2c48..cb007ff69c 100644 --- a/app/views/robots_txt/index.erb +++ b/app/views/robots_txt/index.erb @@ -5,9 +5,6 @@ # <% @robots_info[:agents].each do |agent| %> User-agent: <%= agent[:name] %> -<%- if agent[:delay] -%> -Crawl-delay: <%= agent[:delay] %> -<%- end -%> <% agent[:disallow].each do |path| %> Disallow: <%= path %> <% end %> diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 6f8f2f9577..14301fe56a 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -216,6 +216,8 @@ en: local_login_cannot_be_disabled_if_second_factor_enforced: "You cannot disable local login if 2FA is enforced. Disable enforced 2FA before disabling local logins." cannot_enable_s3_uploads_when_s3_enabled_globally: "You cannot enable S3 uploads because S3 uploads are already globally enabled, and enabling this site-level could cause critical issues with uploads" cors_origins_should_not_have_trailing_slash: "You should not add the trailing slash (/) to CORS origins." + slow_down_crawler_user_agent_must_be_at_least_3_characters: "User agents must be at least 3 characters long to avoid incorrectly rate limiting human users." + slow_down_crawler_user_agent_cannot_be_popular_browsers: "You cannot add any of the following values to the setting: %{values}." conflicting_google_user_id: 'The Google Account ID for this account has changed; staff intervention is required for security reasons. Please contact staff and point them to
https://meta.discourse.org/t/76575' onebox: invalid_address: "Sorry, we were unable to generate a preview for this web page, because the server '%{hostname}' could not be found. Instead of a preview, only a link will appear in your post. :cry:" @@ -1611,7 +1613,7 @@ en: allowed_iframes: "A list of iframe src domain prefixes that discourse can safely allow in posts" allowed_crawler_user_agents: "User agents of web crawlers that should be allowed to access the site. WARNING! SETTING THIS WILL DISALLOW ALL CRAWLERS NOT LISTED HERE!" blocked_crawler_user_agents: "Unique case insensitive word in the user agent string identifying web crawlers that should not be allowed to access the site. Does not apply if allowlist is defined." - slow_down_crawler_user_agents: "User agents of web crawlers that should be rate limited in robots.txt using the Crawl-delay directive" + slow_down_crawler_user_agents: "User agents of web crawlers that should be rate limited as configured in the \"slow down crawler rate\" setting. Each value must be at least 3 characters long." slow_down_crawler_rate: "If slow_down_crawler_user_agents is specified this rate will apply to all the crawlers (number of seconds delay between requests)" content_security_policy: "Enable Content-Security-Policy" content_security_policy_report_only: "Enable Content-Security-Policy-Report-Only" diff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rb index ebfcbfcfe1..2c574bf251 100644 --- a/lib/site_settings/validations.rb +++ b/lib/site_settings/validations.rb @@ -3,6 +3,28 @@ module SiteSettings; end module SiteSettings::Validations + PROHIBITED_USER_AGENT_STRINGS = %w[ + apple + windows + linux + ubuntu + gecko + firefox + chrome + safari + applewebkit + webkit + mozilla + macintosh + khtml + intel + osx + os\ x + iphone + ipad + mac + ] + def validate_error(key, opts = {}) raise Discourse::InvalidParameters.new(I18n.t("errors.site_settings.#{key}", opts)) end @@ -201,6 +223,22 @@ module SiteSettings::Validations validate_error :cors_origins_should_not_have_trailing_slash end + def validate_slow_down_crawler_user_agents(new_val) + return if new_val.blank? + + new_val.downcase.split("|").each do |crawler| + if crawler.size < 3 + validate_error(:slow_down_crawler_user_agent_must_be_at_least_3_characters) + end + if PROHIBITED_USER_AGENT_STRINGS.any? { |c| c.include?(crawler) } + validate_error( + :slow_down_crawler_user_agent_cannot_be_popular_browsers, + values: PROHIBITED_USER_AGENT_STRINGS.join(I18n.t("word_connector.comma")) + ) + end + end + end + private def validate_bucket_setting(setting_name, upload_bucket, backup_bucket) diff --git a/spec/lib/site_settings/validations_spec.rb b/spec/lib/site_settings/validations_spec.rb index 747099f39a..6b6999cf34 100644 --- a/spec/lib/site_settings/validations_spec.rb +++ b/spec/lib/site_settings/validations_spec.rb @@ -308,4 +308,65 @@ describe SiteSettings::Validations do end end end + + context "slow_down_crawler_user_agents" do + let(:too_short_message) do + I18n.t( + "errors.site_settings.slow_down_crawler_user_agent_must_be_at_least_3_characters" + ) + end + let(:popular_browser_message) do + I18n.t( + "errors.site_settings.slow_down_crawler_user_agent_cannot_be_popular_browsers", + values: SiteSettings::Validations::PROHIBITED_USER_AGENT_STRINGS.join(I18n.t("word_connector.comma")) + ) + end + + it "cannot contain a user agent that's shorter than 3 characters" do + expect { + subject.validate_slow_down_crawler_user_agents("ao|acsw") + }.to raise_error(Discourse::InvalidParameters, too_short_message) + expect { + subject.validate_slow_down_crawler_user_agents("up") + }.to raise_error(Discourse::InvalidParameters, too_short_message) + expect { + subject.validate_slow_down_crawler_user_agents("a|") + }.to raise_error(Discourse::InvalidParameters, too_short_message) + expect { + subject.validate_slow_down_crawler_user_agents("|a") + }.to raise_error(Discourse::InvalidParameters, too_short_message) + end + + it "allows user agents that are 3 characters or longer" do + expect { + subject.validate_slow_down_crawler_user_agents("aoc") + }.not_to raise_error + expect { + subject.validate_slow_down_crawler_user_agents("anuq") + }.not_to raise_error + expect { + subject.validate_slow_down_crawler_user_agents("pupsc|kcx") + }.not_to raise_error + end + + it "allows the setting to be empty" do + expect { + subject.validate_slow_down_crawler_user_agents("") + }.not_to raise_error + end + + it "cannot contain a token of a popular browser user agent" do + expect { + subject.validate_slow_down_crawler_user_agents("mOzilla") + }.to raise_error(Discourse::InvalidParameters, popular_browser_message) + + expect { + subject.validate_slow_down_crawler_user_agents("chRome|badcrawler") + }.to raise_error(Discourse::InvalidParameters, popular_browser_message) + + expect { + subject.validate_slow_down_crawler_user_agents("html|badcrawler") + }.to raise_error(Discourse::InvalidParameters, popular_browser_message) + end + end end diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb index 34d9ecb07f..112e637271 100644 --- a/spec/requests/application_controller_spec.rb +++ b/spec/requests/application_controller_spec.rb @@ -941,4 +941,62 @@ RSpec.describe ApplicationController do ).to eq("user_api_key_limiter_1_day") end end + + describe "crawlers in slow_down_crawler_user_agents site setting" do + before do + RateLimiter.enable + RateLimiter.clear_all! + end + + it "are rate limited" do + SiteSetting.slow_down_crawler_rate = 128 + SiteSetting.slow_down_crawler_user_agents = "badcrawler|problematiccrawler" + now = Time.zone.now + freeze_time now + + get "/", headers: { + "HTTP_USER_AGENT" => "iam badcrawler" + } + expect(response.status).to eq(200) + get "/", headers: { + "HTTP_USER_AGENT" => "iam badcrawler" + } + expect(response.status).to eq(429) + expect(response.headers["Retry-After"]).to eq("128") + + get "/", headers: { + "HTTP_USER_AGENT" => "iam problematiccrawler" + } + expect(response.status).to eq(200) + get "/", headers: { + "HTTP_USER_AGENT" => "iam problematiccrawler" + } + expect(response.status).to eq(429) + expect(response.headers["Retry-After"]).to eq("128") + + freeze_time now + 100.seconds + get "/", headers: { + "HTTP_USER_AGENT" => "iam badcrawler" + } + expect(response.status).to eq(429) + expect(response.headers["Retry-After"]).to eq("28") + + get "/", headers: { + "HTTP_USER_AGENT" => "iam problematiccrawler" + } + expect(response.status).to eq(429) + expect(response.headers["Retry-After"]).to eq("28") + + freeze_time now + 150.seconds + get "/", headers: { + "HTTP_USER_AGENT" => "iam badcrawler" + } + expect(response.status).to eq(200) + + get "/", headers: { + "HTTP_USER_AGENT" => "iam problematiccrawler" + } + expect(response.status).to eq(200) + end + end end diff --git a/spec/requests/robots_txt_controller_spec.rb b/spec/requests/robots_txt_controller_spec.rb index b20627c0d8..0672612c62 100644 --- a/spec/requests/robots_txt_controller_spec.rb +++ b/spec/requests/robots_txt_controller_spec.rb @@ -56,17 +56,6 @@ RSpec.describe RobotsTxtController do end end - context 'crawl delay' do - it 'allows you to set crawl delay on particular bots' do - SiteSetting.allow_index_in_robots_txt = true - SiteSetting.slow_down_crawler_rate = 17 - SiteSetting.slow_down_crawler_user_agents = 'bingbot|googlebot' - get '/robots.txt' - expect(response.body).to include("\nUser-agent: bingbot\nCrawl-delay: 17") - expect(response.body).to include("\nUser-agent: googlebot\nCrawl-delay: 17") - end - end - context 'allow_index_in_robots_txt is true' do def expect_allowed_and_disallowed_sections(allow_index, disallow_index) From 77a1d8675c6992ecc07d9444a5b3701dd752c00f Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 30 Nov 2021 11:54:38 +0100 Subject: [PATCH 148/168] FIX: adds 422 status code to bootstrap json (#15138) A post error validation would return a 422 status code. This status code was not accepted with the recent changes to bootstrap-json/index.js and would return a "Discourse Build Error" string, preventing any kind of bootbox popup error in the composer. --- app/assets/javascripts/discourse/lib/bootstrap-json/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js index 1685d5328e..ece7a60629 100644 --- a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js +++ b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js @@ -240,6 +240,7 @@ async function handleRequest(proxy, baseURL, req, res) { 308, 404, 403, + 422, 500, ]; const proxyRequest = bent(req.method, acceptedStatusCodes); From fced35de157ef9fa8b64507352a81a57997a97cd Mon Sep 17 00:00:00 2001 From: Osama Sayegh Date: Tue, 30 Nov 2021 14:58:42 +0300 Subject: [PATCH 149/168] UX: Add title attribute to reports cells (#15137) Some reports, like the Web Crawler User Agents report, have very long strings that need to be truncated when displayed. However, there is no way to see the full value without exporting the report or inspecting the elements using dev tools. This PR set a `title` attribute with the full value to the reports `` elements so that the full value is shown on hover. --- .../admin/addon/components/admin-report-table-cell.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js index aadf6e0f73..7ef4f7d9c1 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js @@ -6,6 +6,7 @@ export default Component.extend({ tagName: "td", classNames: ["admin-report-table-cell"], classNameBindings: ["type", "property"], + attributeBindings: ["value:title"], options: null, @discourseComputed("label", "data", "options") From 24356e339b3707478c0c914df7fddbaca620c574 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 30 Nov 2021 13:01:39 +0100 Subject: [PATCH 150/168] DEV: Fix pending posts page, make tests work in legacy env (#15132) * Running the tests only in the ember cli env hid the fact that the pending posts feature wasn't working in the legacy environment * Tests were using ember-cli-only APIs while there are widely used testing APIs in Discourse that support both ember envs * `ember-test-selectors` was in both dependencies and devDependencies in discourse/package.json * `qunit-dom` in package.json was not only unused but also defunct, as it wasn't pulled into the legacy env app A followup to #14501, and #15128. --- .../pending.hbs => user-activity-pending.hbs} | 2 +- app/assets/javascripts/discourse/package.json | 3 +- .../tests/acceptance/pending-posts-test.js | 19 +++---- .../tests/acceptance/sticky-avatars-test.js | 28 ++++------ .../components/empty-state-test.js | 27 ++++------ .../components/pending-post-test.js | 54 +++++++++---------- package.json | 1 - 7 files changed, 55 insertions(+), 79 deletions(-) rename app/assets/javascripts/discourse/app/templates/{user-activity/pending.hbs => user-activity-pending.hbs} (67%) diff --git a/app/assets/javascripts/discourse/app/templates/user-activity/pending.hbs b/app/assets/javascripts/discourse/app/templates/user-activity-pending.hbs similarity index 67% rename from app/assets/javascripts/discourse/app/templates/user-activity/pending.hbs rename to app/assets/javascripts/discourse/app/templates/user-activity-pending.hbs index ee48832b71..2b39f3fa6c 100644 --- a/app/assets/javascripts/discourse/app/templates/user-activity/pending.hbs +++ b/app/assets/javascripts/discourse/app/templates/user-activity-pending.hbs @@ -1,5 +1,5 @@
    - {{#each @model as |pending_post|}} + {{#each this.model as |pending_post|}} {{/each}}
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index d8a89ee421..ef1539fb10 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -81,7 +81,6 @@ ] }, "devDependencies": { - "ember-exam": "6.1.0", - "ember-test-selectors": "^6.0.0" + "ember-exam": "6.1.0" } } diff --git a/app/assets/javascripts/discourse/tests/acceptance/pending-posts-test.js b/app/assets/javascripts/discourse/tests/acceptance/pending-posts-test.js index 05bb8b5880..3644b0eea3 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/pending-posts-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/pending-posts-test.js @@ -1,31 +1,26 @@ -import { acceptance } from "discourse/tests/helpers/qunit-helpers"; +import { + acceptance, + count, + exists, +} from "discourse/tests/helpers/qunit-helpers"; import { test } from "qunit"; import { click, visit } from "@ember/test-helpers"; -import { setupApplicationTest as EMBER_CLI_ENV } from "ember-qunit"; acceptance("Pending posts - no existing pending posts", function (needs) { - if (!EMBER_CLI_ENV) { - return; // dom helpers not available in legacy env - } - needs.user(); test("No link to pending posts", async function (assert) { await visit("/u/eviltrout"); - assert.dom(".action-list").doesNotIncludeText("Pending"); + assert.ok(!exists(".action-list [href='/u/eviltrout/activity/pending']")); }); }); acceptance("Pending posts - existing pending posts", function (needs) { - if (!EMBER_CLI_ENV) { - return; // dom helpers not available in legacy env - } - needs.user({ pending_posts_count: 2 }); test("Navigate to pending posts", async function (assert) { await visit("/u/eviltrout"); await click("[href='/u/eviltrout/activity/pending']"); - assert.dom(".user-stream-item").exists({ count: 2 }); + assert.strictEqual(count(".user-stream-item"), 2); }); }); diff --git a/app/assets/javascripts/discourse/tests/acceptance/sticky-avatars-test.js b/app/assets/javascripts/discourse/tests/acceptance/sticky-avatars-test.js index e4542dc8bb..042f8232f5 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sticky-avatars-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sticky-avatars-test.js @@ -1,28 +1,18 @@ -import { acceptance } from "discourse/tests/helpers/qunit-helpers"; +import { acceptance, query } from "discourse/tests/helpers/qunit-helpers"; import { skip } from "qunit"; -import { find, scrollTo, visit, waitUntil } from "@ember/test-helpers"; -import { setupApplicationTest as EMBER_CLI_ENV } from "ember-qunit"; - -acceptance("Sticky Avatars", function (needs) { - if (!EMBER_CLI_ENV) { - return; // helpers not available in legacy env - } - - const container = document.getElementById("ember-testing-container"); - - needs.hooks.beforeEach(function () { - container.scrollTop = 0; - }); +import { visit } from "@ember/test-helpers"; +acceptance("Sticky Avatars", function () { skip("Adds sticky avatars when scrolling up", async function (assert) { + const container = document.getElementById("ember-testing-container"); + container.scrollTo(0, 0); + await visit("/t/internationalization-localization/280"); + container.scrollTo(0, 800); + container.scrollTo(0, 700); - await scrollTo(container, 0, 800); - await scrollTo(container, 0, 700); - - await waitUntil(() => find(".sticky-avatar")); assert.ok( - find("#post_5").parentElement.classList.contains("sticky-avatar"), + query("#post_5").parentElement.classList.contains("sticky-avatar"), "Sticky avatar is applied" ); }); diff --git a/app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js b/app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js index bfeaadcea6..3c504caf2b 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js @@ -1,23 +1,18 @@ -import { module, test } from "qunit"; -import { setupRenderingTest } from "ember-qunit"; -import { render } from "@ember/test-helpers"; +import { discourseModule, query } from "discourse/tests/helpers/qunit-helpers"; +import componentTest, { + setupRenderingTest, +} from "discourse/tests/helpers/component-test"; import hbs from "htmlbars-inline-precompile"; -const LEGACY_ENV = !setupRenderingTest; - -module("Integration | Component | empty-state", function (hooks) { - if (LEGACY_ENV) { - return; - } - +discourseModule("Integration | Component | empty-state", function (hooks) { setupRenderingTest(hooks); - test("it renders", async function (assert) { - await render(hbs` - - `); + componentTest("it renders", { + template: hbs``, - assert.dom("[data-test-title]").hasText("title"); - assert.dom("[data-test-body]").hasText("body"); + test(assert) { + assert.strictEqual(query("[data-test-title]").textContent, "title"); + assert.strictEqual(query("[data-test-body]").textContent, "body"); + }, }); }); diff --git a/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js b/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js index 55d4ab43a1..85be0e9dff 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js @@ -1,37 +1,35 @@ -import { module, test } from "qunit"; -import { setupRenderingTest } from "ember-qunit"; -import { render } from "@ember/test-helpers"; +import { discourseModule, query } from "discourse/tests/helpers/qunit-helpers"; +import componentTest, { + setupRenderingTest, +} from "discourse/tests/helpers/component-test"; import hbs from "htmlbars-inline-precompile"; -import PendingPost from "discourse/models/pending-post"; import createStore from "discourse/tests/helpers/create-store"; -const LEGACY_ENV = !setupRenderingTest; - -module("Integration | Component | pending-post", function (hooks) { - if (LEGACY_ENV) { - return; - } - +discourseModule("Integration | Component | pending-post", function (hooks) { setupRenderingTest(hooks); - test("it renders", async function (assert) { - const store = createStore(); - store.createRecord("category", { id: 2 }); - const post = PendingPost.create({ - id: 1, - topic_url: "topic-url", - username: "USERNAME", - category_id: 2, - raw_text: "**bold text**", - }); - this.set("post", post); + componentTest("it renders", { + template: hbs``, - await render(hbs``); + beforeEach() { + const store = createStore(); + store.createRecord("category", { id: 2 }); + const post = store.createRecord("pending-post", { + id: 1, + topic_url: "topic-url", + username: "USERNAME", + category_id: 2, + raw_text: "**bold text**", + }); + this.set("post", post); + }, - assert.equal( - this.element.querySelector("p.excerpt").textContent.trim(), - "bold text", - "renders the cooked text" - ); + test(assert) { + assert.strictEqual( + query("p.excerpt").textContent.trim(), + "bold text", + "renders the cooked text" + ); + }, }); }); diff --git a/package.json b/package.json index e71e86bdd1..7881bcf8f9 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "pretender": "^3.4.7", "puppeteer": "1.20", "qunit": "2.8.0", - "qunit-dom": "^2.0.0", "route-recognizer": "^0.3.3", "sinon": "^9.0.2", "squoosh": "discourse/squoosh#dc9649d" From 88f9bb3dc99eab61108ce1140bbf3153fc054542 Mon Sep 17 00:00:00 2001 From: Andrei Prigorshnev Date: Tue, 30 Nov 2021 16:59:37 +0400 Subject: [PATCH 151/168] FIX: do not suggest "user1" as a username to invited users (#15031) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recently, the wrong new behavior appeared – we started to suggest to invited users usernames like "user1". To reproduce: 1. Create an invitation with default settings, do not restrict it to email 2. Copy an invitation link and follow it in incognito mode See username already filled, with eg “user1”. See screenshot. Should be empty. This bug was very likely introduced by my recent changes to UserNameSuggester. --- app/controllers/invites_controller.rb | 8 +++++++- spec/requests/invites_controller_spec.rb | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index 3cc4ecc455..1e1fd7c431 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -69,11 +69,17 @@ class InvitesController < ApplicationController hidden_email = email != invite.email + if hidden_email || invite.email.nil? + username = "" + else + username = UserNameSuggester.suggest(invite.email) + end + info = { invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false), email: email, hidden_email: hidden_email, - username: hidden_email ? '' : UserNameSuggester.suggest(invite.email), + username: username, is_invite_link: invite.is_invite_link?, email_verified_by_link: email_verified_by_link } diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb index eea1a2d362..ac4f784ae9 100644 --- a/spec/requests/invites_controller_spec.rb +++ b/spec/requests/invites_controller_spec.rb @@ -13,9 +13,15 @@ describe InvitesController do get "/invites/#{invite.invite_key}" expect(response.status).to eq(200) expect(response.body).to have_tag(:script, with: { src: '/assets/application.js' }) - expect(response.body).to include('i*****g@a***********e.ooo') expect(response.body).not_to include(invite.email) expect(response.body).to_not include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url)) + + expect(response.body).to have_tag('div#data-preloaded') do |element| + json = JSON.parse(element.current_scope.attribute('data-preloaded').value) + invite_info = JSON.parse(json['invite_info']) + expect(invite_info['username']).to eq('') + expect(invite_info['email']).to eq('i*****g@a***********e.ooo') + end end it 'shows unobfuscated email if email data is present in authentication data' do From 284ab8cdf74d7535b54aebbed4cd28e38d79c17b Mon Sep 17 00:00:00 2001 From: Andrei Prigorshnev Date: Tue, 30 Nov 2021 17:01:06 +0400 Subject: [PATCH 152/168] DEV: migrate (almost all) routes from `actions:` to `@action` syntax (#14722) This should be safe, all these places are pretty straightforward. I've run into one problem when changing this, though. That problem was fixed in https://github.com/discourse/discourse/pull/14624 --- .../javascripts/discourse/app/routes/about.js | 10 +- .../routes/build-admin-user-posts-route.js | 10 +- .../app/routes/discovery-categories.js | 47 +-- .../discourse/app/routes/discovery.js | 84 +++-- .../discourse/app/routes/exception.js | 10 +- .../discourse/app/routes/full-page-search.js | 10 +- .../app/routes/group-activity-posts.js | 9 +- .../discourse/app/routes/group-manage-logs.js | 8 +- .../app/routes/preferences-account.js | 8 +- .../app/routes/preferences-second-factor.js | 38 +- .../discourse/app/routes/review-index.js | 8 +- .../discourse/app/routes/topic-from-params.js | 17 +- .../javascripts/discourse/app/routes/topic.js | 336 +++++++++--------- .../app/routes/user-activity-drafts.js | 10 +- .../discourse/app/routes/user-badges.js | 10 +- .../discourse/app/routes/user-invited-show.js | 8 +- .../app/routes/user-notifications.js | 10 +- .../javascripts/discourse/app/routes/user.js | 15 +- .../javascripts/discourse/app/routes/users.js | 10 +- 19 files changed, 338 insertions(+), 320 deletions(-) diff --git a/app/assets/javascripts/discourse/app/routes/about.js b/app/assets/javascripts/discourse/app/routes/about.js index efc663e0a4..44d06514af 100644 --- a/app/assets/javascripts/discourse/app/routes/about.js +++ b/app/assets/javascripts/discourse/app/routes/about.js @@ -1,6 +1,7 @@ import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; +import { action } from "@ember/object"; export default DiscourseRoute.extend({ model() { @@ -36,10 +37,9 @@ export default DiscourseRoute.extend({ return I18n.t("about.simple_title"); }, - actions: { - didTransition() { - this.controllerFor("application").set("showFooter", true); - return true; - }, + @action + didTransition() { + this.controllerFor("application").set("showFooter", true); + return true; }, }); diff --git a/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js b/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js index b56971fdae..1045f31022 100644 --- a/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js +++ b/app/assets/javascripts/discourse/app/routes/build-admin-user-posts-route.js @@ -1,14 +1,14 @@ import DiscourseRoute from "discourse/routes/discourse"; import { emojiUnescape } from "discourse/lib/text"; import { escapeExpression } from "discourse/lib/utilities"; +import { action } from "@ember/object"; export default function (filter) { return DiscourseRoute.extend({ - actions: { - didTransition() { - this.controllerFor("user-posts")._showFooter(); - return true; - }, + @action + didTransition() { + this.controllerFor("user-posts")._showFooter(); + return true; }, model() { diff --git a/app/assets/javascripts/discourse/app/routes/discovery-categories.js b/app/assets/javascripts/discourse/app/routes/discovery-categories.js index 344a3be619..f689c27e87 100644 --- a/app/assets/javascripts/discourse/app/routes/discovery-categories.js +++ b/app/assets/javascripts/discourse/app/routes/discovery-categories.js @@ -1,6 +1,6 @@ import CategoryList from "discourse/models/category-list"; import DiscourseRoute from "discourse/routes/discourse"; -import EmberObject from "@ember/object"; +import EmberObject, { action } from "@ember/object"; import I18n from "I18n"; import OpenComposer from "discourse/mixins/open-composer"; import PreloadStore from "discourse/lib/preload-store"; @@ -130,31 +130,34 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, { }); }, - actions: { - triggerRefresh() { - this.refresh(); - }, + @action + triggerRefresh() { + this.refresh(); + }, - createCategory() { - this.transitionTo("newCategory"); - }, + @action + createCategory() { + this.transitionTo("newCategory"); + }, - reorderCategories() { - showModal("reorderCategories"); - }, + @action + reorderCategories() { + showModal("reorderCategories"); + }, - createTopic() { - if (this.get("currentUser.has_topic_draft")) { - this.openTopicDraft(); - } else { - this.openComposer(this.controllerFor("discovery/categories")); - } - }, + @action + createTopic() { + if (this.get("currentUser.has_topic_draft")) { + this.openTopicDraft(); + } else { + this.openComposer(this.controllerFor("discovery/categories")); + } + }, - didTransition() { - next(() => this.controllerFor("application").set("showFooter", true)); - return true; - }, + @action + didTransition() { + next(() => this.controllerFor("application").set("showFooter", true)); + return true; }, }); diff --git a/app/assets/javascripts/discourse/app/routes/discovery.js b/app/assets/javascripts/discourse/app/routes/discovery.js index c8ab3ad57f..55a5ca0f05 100644 --- a/app/assets/javascripts/discourse/app/routes/discovery.js +++ b/app/assets/javascripts/discourse/app/routes/discovery.js @@ -8,6 +8,7 @@ import User from "discourse/models/user"; import { scrollTop } from "discourse/mixins/scroll-top"; import { setTopicList } from "discourse/lib/topic-list-tracker"; import Site from "discourse/models/site"; +import { action } from "@ember/object"; export default DiscourseRoute.extend(OpenComposer, { queryParams: { @@ -44,52 +45,57 @@ export default DiscourseRoute.extend(OpenComposer, { } }, - actions: { - loading() { - this.controllerFor("discovery").loadingBegan(); + @action + loading() { + this.controllerFor("discovery").loadingBegan(); - // We don't want loading to bubble - return true; - }, + // We don't want loading to bubble + return true; + }, - loadingComplete() { - this.controllerFor("discovery").loadingComplete(); - if (!this.session.get("topicListScrollPosition")) { - scrollTop(); - } - }, + @action + loadingComplete() { + this.controllerFor("discovery").loadingComplete(); + if (!this.session.get("topicListScrollPosition")) { + scrollTop(); + } + }, - didTransition() { - this.send("loadingComplete"); + @action + didTransition() { + this.send("loadingComplete"); - const model = this.controllerFor("discovery/topics").get("model"); - setTopicList(model); - }, + const model = this.controllerFor("discovery/topics").get("model"); + setTopicList(model); + }, - // clear a pinned topic - clearPin(topic) { - topic.clearPin(); - }, + // clear a pinned topic + @action + clearPin(topic) { + topic.clearPin(); + }, - createTopic() { - if (this.get("currentUser.has_topic_draft")) { - this.openTopicDraft(); - } else { - this.openComposer(this.controllerFor("discovery/topics")); - } - }, + @action + createTopic() { + if (this.get("currentUser.has_topic_draft")) { + this.openTopicDraft(); + } else { + this.openComposer(this.controllerFor("discovery/topics")); + } + }, - dismissReadTopics(dismissTopics) { - const operationType = dismissTopics ? "topics" : "posts"; - this.send("dismissRead", operationType); - }, + @action + dismissReadTopics(dismissTopics) { + const operationType = dismissTopics ? "topics" : "posts"; + this.send("dismissRead", operationType); + }, - dismissRead(operationType) { - const controller = this.controllerFor("discovery/topics"); - controller.send("dismissRead", operationType, { - categoryId: controller.get("category.id"), - includeSubcategories: !controller.noSubcategories, - }); - }, + @action + dismissRead(operationType) { + const controller = this.controllerFor("discovery/topics"); + controller.send("dismissRead", operationType, { + categoryId: controller.get("category.id"), + includeSubcategories: !controller.noSubcategories, + }); }, }); diff --git a/app/assets/javascripts/discourse/app/routes/exception.js b/app/assets/javascripts/discourse/app/routes/exception.js index c87b06d4f0..2bd40f1887 100644 --- a/app/assets/javascripts/discourse/app/routes/exception.js +++ b/app/assets/javascripts/discourse/app/routes/exception.js @@ -1,14 +1,14 @@ import DiscourseRoute from "discourse/routes/discourse"; +import { action } from "@ember/object"; export default DiscourseRoute.extend({ serialize() { return ""; }, - actions: { - didTransition() { - this.controllerFor("application").set("showFooter", true); - return true; - }, + @action + didTransition() { + this.controllerFor("application").set("showFooter", true); + return true; }, }); diff --git a/app/assets/javascripts/discourse/app/routes/full-page-search.js b/app/assets/javascripts/discourse/app/routes/full-page-search.js index 71ccb8fdbd..a348b6b504 100644 --- a/app/assets/javascripts/discourse/app/routes/full-page-search.js +++ b/app/assets/javascripts/discourse/app/routes/full-page-search.js @@ -9,6 +9,7 @@ import I18n from "I18n"; import PreloadStore from "discourse/lib/preload-store"; import { ajax } from "discourse/lib/ajax"; import { escapeExpression } from "discourse/lib/utilities"; +import { action } from "@ember/object"; export default DiscourseRoute.extend({ queryParams: { @@ -64,10 +65,9 @@ export default DiscourseRoute.extend({ }); }, - actions: { - didTransition() { - this.controllerFor("full-page-search")._showFooter(); - return true; - }, + @action + didTransition() { + this.controllerFor("full-page-search")._showFooter(); + return true; }, }); diff --git a/app/assets/javascripts/discourse/app/routes/group-activity-posts.js b/app/assets/javascripts/discourse/app/routes/group-activity-posts.js index 0c805e51cc..dddbc26f87 100644 --- a/app/assets/javascripts/discourse/app/routes/group-activity-posts.js +++ b/app/assets/javascripts/discourse/app/routes/group-activity-posts.js @@ -1,6 +1,6 @@ import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; -import { get } from "@ember/object"; +import { action, get } from "@ember/object"; export function buildGroupPage(type) { return DiscourseRoute.extend({ @@ -29,10 +29,9 @@ export function buildGroupPage(type) { this.render("group-activity-posts"); }, - actions: { - didTransition() { - return true; - }, + @action + didTransition() { + return true; }, }); } diff --git a/app/assets/javascripts/discourse/app/routes/group-manage-logs.js b/app/assets/javascripts/discourse/app/routes/group-manage-logs.js index 4cdd9bd0cc..cf5130d466 100644 --- a/app/assets/javascripts/discourse/app/routes/group-manage-logs.js +++ b/app/assets/javascripts/discourse/app/routes/group-manage-logs.js @@ -1,5 +1,6 @@ import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; +import { action } from "@ember/object"; export default DiscourseRoute.extend({ titleToken() { @@ -14,9 +15,8 @@ export default DiscourseRoute.extend({ this.controllerFor("group-manage-logs").setProperties({ model }); }, - actions: { - willTransition() { - this.controllerFor("group-manage-logs").reset(); - }, + @action + willTransition() { + this.controllerFor("group-manage-logs").reset(); }, }); diff --git a/app/assets/javascripts/discourse/app/routes/preferences-account.js b/app/assets/javascripts/discourse/app/routes/preferences-account.js index 47bcae2b82..fc12eb6c07 100644 --- a/app/assets/javascripts/discourse/app/routes/preferences-account.js +++ b/app/assets/javascripts/discourse/app/routes/preferences-account.js @@ -1,6 +1,7 @@ import RestrictedUserRoute from "discourse/routes/restricted-user"; import UserBadge from "discourse/models/user-badge"; import showModal from "discourse/lib/show-modal"; +import { action } from "@ember/object"; export default RestrictedUserRoute.extend({ showFooter: true, @@ -33,9 +34,8 @@ export default RestrictedUserRoute.extend({ }); }, - actions: { - showAvatarSelector(user) { - showModal("avatar-selector").setProperties({ user }); - }, + @action + showAvatarSelector(user) { + showModal("avatar-selector").setProperties({ user }); }, }); diff --git a/app/assets/javascripts/discourse/app/routes/preferences-second-factor.js b/app/assets/javascripts/discourse/app/routes/preferences-second-factor.js index 54c5b9ccb3..46d296b2e5 100644 --- a/app/assets/javascripts/discourse/app/routes/preferences-second-factor.js +++ b/app/assets/javascripts/discourse/app/routes/preferences-second-factor.js @@ -1,4 +1,5 @@ import RestrictedUserRoute from "discourse/routes/restricted-user"; +import { action } from "@ember/object"; export default RestrictedUserRoute.extend({ showFooter: true, @@ -34,27 +35,26 @@ export default RestrictedUserRoute.extend({ .finally(() => controller.set("loading", false)); }, - actions: { - willTransition(transition) { - this._super(...arguments); + @action + willTransition(transition) { + this._super(...arguments); - const controller = this.controllerFor("preferences/second-factor"); - const user = controller.get("currentUser"); - const settings = controller.get("siteSettings"); + const controller = this.controllerFor("preferences/second-factor"); + const user = controller.get("currentUser"); + const settings = controller.get("siteSettings"); - if ( - transition.targetName === "preferences.second-factor" || - !user || - user.is_anonymous || - user.second_factor_enabled || - (settings.enforce_second_factor === "staff" && !user.staff) || - settings.enforce_second_factor === "no" - ) { - return true; - } + if ( + transition.targetName === "preferences.second-factor" || + !user || + user.is_anonymous || + user.second_factor_enabled || + (settings.enforce_second_factor === "staff" && !user.staff) || + settings.enforce_second_factor === "no" + ) { + return true; + } - transition.abort(); - return false; - }, + transition.abort(); + return false; }, }); diff --git a/app/assets/javascripts/discourse/app/routes/review-index.js b/app/assets/javascripts/discourse/app/routes/review-index.js index a19b0f9952..67c16c6a31 100644 --- a/app/assets/javascripts/discourse/app/routes/review-index.js +++ b/app/assets/javascripts/discourse/app/routes/review-index.js @@ -1,5 +1,6 @@ import DiscourseRoute from "discourse/routes/discourse"; import { isPresent } from "@ember/utils"; +import { action } from "@ember/object"; export default DiscourseRoute.extend({ model(params) { @@ -74,9 +75,8 @@ export default DiscourseRoute.extend({ this.messageBus.unsubscribe("/reviewable_claimed"); }, - actions: { - refreshRoute() { - this.refresh(); - }, + @action + refreshRoute() { + this.refresh(); }, }); diff --git a/app/assets/javascripts/discourse/app/routes/topic-from-params.js b/app/assets/javascripts/discourse/app/routes/topic-from-params.js index e2918e1f42..b1f30baa5c 100644 --- a/app/assets/javascripts/discourse/app/routes/topic-from-params.js +++ b/app/assets/javascripts/discourse/app/routes/topic-from-params.js @@ -4,6 +4,7 @@ import Draft from "discourse/models/draft"; import { isEmpty } from "@ember/utils"; import { isTesting } from "discourse-common/config/environment"; import { schedule } from "@ember/runloop"; +import { action } from "@ember/object"; // This route is used for retrieving a topic based on params export default DiscourseRoute.extend({ @@ -114,16 +115,12 @@ export default DiscourseRoute.extend({ } }, - actions: { - willTransition() { - this.controllerFor("topic").set( - "previousURL", - document.location.pathname - ); + @action + willTransition() { + this.controllerFor("topic").set("previousURL", document.location.pathname); - // NOTE: omitting this return can break the back button when transitioning quickly between - // topics and the latest page. - return true; - }, + // NOTE: omitting this return can break the back button when transitioning quickly between + // topics and the latest page. + return true; }, }); diff --git a/app/assets/javascripts/discourse/app/routes/topic.js b/app/assets/javascripts/discourse/app/routes/topic.js index a5c26b1d3d..a7c4b6a3fb 100644 --- a/app/assets/javascripts/discourse/app/routes/topic.js +++ b/app/assets/javascripts/discourse/app/routes/topic.js @@ -2,7 +2,7 @@ import { cancel, later, schedule } from "@ember/runloop"; import DiscourseRoute from "discourse/routes/discourse"; import DiscourseURL from "discourse/lib/url"; import { ID_CONSTRAINT } from "discourse/models/topic"; -import { get } from "@ember/object"; +import { action, get } from "@ember/object"; import { isEmpty } from "@ember/utils"; import { inject as service } from "@ember/service"; import { setTopicId } from "discourse/lib/topic-list-tracker"; @@ -60,185 +60,197 @@ const TopicRoute = DiscourseRoute.extend({ } }, - actions: { - showInvite() { - let invitePanelTitle; + @action + showInvite() { + let invitePanelTitle; - if (this.isPM) { - invitePanelTitle = "topic.invite_private.title"; - } else if (this.invitingToTopic) { - invitePanelTitle = "topic.invite_reply.title"; - } else { - invitePanelTitle = "user.invited.create"; - } + if (this.isPM) { + invitePanelTitle = "topic.invite_private.title"; + } else if (this.invitingToTopic) { + invitePanelTitle = "topic.invite_reply.title"; + } else { + invitePanelTitle = "user.invited.create"; + } - showModal("share-and-invite", { - modalClass: "share-and-invite", - panels: [ - { - id: "invite", - title: invitePanelTitle, - model: { - inviteModel: this.modelFor("topic"), - }, + showModal("share-and-invite", { + modalClass: "share-and-invite", + panels: [ + { + id: "invite", + title: invitePanelTitle, + model: { + inviteModel: this.modelFor("topic"), }, - ], - }); - }, + }, + ], + }); + }, - showFlags(model) { - let controller = showModal("flag", { model }); - controller.setProperties({ flagTopic: false }); - }, + @action + showFlags(model) { + let controller = showModal("flag", { model }); + controller.setProperties({ flagTopic: false }); + }, - showFlagTopic() { - const model = this.modelFor("topic"); - let controller = showModal("flag", { model }); - controller.setProperties({ flagTopic: true }); - }, + @action + showFlagTopic() { + const model = this.modelFor("topic"); + let controller = showModal("flag", { model }); + controller.setProperties({ flagTopic: true }); + }, - showPagePublish() { - const model = this.modelFor("topic"); - showModal("publish-page", { - model, - title: "topic.publish_page.title", - }); - }, + @action + showPagePublish() { + const model = this.modelFor("topic"); + showModal("publish-page", { + model, + title: "topic.publish_page.title", + }); + }, - showTopicTimerModal() { - const model = this.modelFor("topic"); + @action + showTopicTimerModal() { + const model = this.modelFor("topic"); - const topicTimer = model.get("topic_timer"); - if (!topicTimer) { - model.set("topic_timer", {}); + const topicTimer = model.get("topic_timer"); + if (!topicTimer) { + model.set("topic_timer", {}); + } + + showModal("edit-topic-timer", { model }); + this.controllerFor("modal").set("modalClass", "edit-topic-timer-modal"); + }, + + @action + showTopicSlowModeUpdate() { + const model = this.modelFor("topic"); + + showModal("edit-slow-mode", { model }); + }, + + @action + showChangeTimestamp() { + showModal("change-timestamp", { + model: this.modelFor("topic"), + title: "topic.change_timestamp.title", + }); + }, + + @action + showFeatureTopic() { + showModal("featureTopic", { + model: this.modelFor("topic"), + title: "topic.feature_topic.title", + }); + this.controllerFor("modal").set("modalClass", "feature-topic-modal"); + this.controllerFor("feature_topic").reset(); + }, + + @action + showHistory(model, revision) { + let historyController = showModal("history", { + model, + modalClass: "history-modal", + }); + historyController.refresh(model.get("id"), revision || "latest"); + historyController.set("post", model); + historyController.set("topicController", this.controllerFor("topic")); + }, + + @action + showGrantBadgeModal() { + showModal("grant-badge", { + model: this.modelFor("topic"), + title: "admin.badges.grant_badge", + }); + }, + + @action + showRawEmail(model) { + showModal("raw-email", { model }); + this.controllerFor("raw_email").loadRawEmail(model.get("id")); + }, + + @action + moveToTopic() { + showModal("move-to-topic", { + model: this.modelFor("topic"), + title: "topic.move_to.title", + }); + }, + + @action + changeOwner() { + showModal("change-owner", { + model: this.modelFor("topic"), + title: "topic.change_owner.title", + }); + }, + + // Use replaceState to update the URL once it changes + @action + postChangedRoute(currentPost) { + // do nothing if we are transitioning to another route + if (this.isTransitioning || TopicRoute.disableReplaceState) { + return; + } + + const topic = this.modelFor("topic"); + if (topic && currentPost) { + let postUrl; + if (currentPost > 1) { + postUrl = topic.urlForPostNumber(currentPost); + } else { + postUrl = topic.url; } - showModal("edit-topic-timer", { model }); - this.controllerFor("modal").set("modalClass", "edit-topic-timer-modal"); - }, + if (this._router.currentRoute.queryParams) { + let searchParams; - showTopicSlowModeUpdate() { - const model = this.modelFor("topic"); - - showModal("edit-slow-mode", { model }); - }, - - showChangeTimestamp() { - showModal("change-timestamp", { - model: this.modelFor("topic"), - title: "topic.change_timestamp.title", - }); - }, - - showFeatureTopic() { - showModal("featureTopic", { - model: this.modelFor("topic"), - title: "topic.feature_topic.title", - }); - this.controllerFor("modal").set("modalClass", "feature-topic-modal"); - this.controllerFor("feature_topic").reset(); - }, - - showHistory(model, revision) { - let historyController = showModal("history", { - model, - modalClass: "history-modal", - }); - historyController.refresh(model.get("id"), revision || "latest"); - historyController.set("post", model); - historyController.set("topicController", this.controllerFor("topic")); - }, - - showGrantBadgeModal() { - showModal("grant-badge", { - model: this.modelFor("topic"), - title: "admin.badges.grant_badge", - }); - }, - - showRawEmail(model) { - showModal("raw-email", { model }); - this.controllerFor("raw_email").loadRawEmail(model.get("id")); - }, - - moveToTopic() { - showModal("move-to-topic", { - model: this.modelFor("topic"), - title: "topic.move_to.title", - }); - }, - - changeOwner() { - showModal("change-owner", { - model: this.modelFor("topic"), - title: "topic.change_owner.title", - }); - }, - - // Use replaceState to update the URL once it changes - postChangedRoute(currentPost) { - // do nothing if we are transitioning to another route - if (this.isTransitioning || TopicRoute.disableReplaceState) { - return; - } - - const topic = this.modelFor("topic"); - - if (topic && currentPost) { - let postUrl; - - if (currentPost > 1) { - postUrl = topic.urlForPostNumber(currentPost); - } else { - postUrl = topic.url; - } - - if (this._router.currentRoute.queryParams) { - let searchParams; - - Object.entries(this._router.currentRoute.queryParams).map( - ([key, value]) => { - if (!searchParams) { - searchParams = new URLSearchParams(); - } - - searchParams.append(key, value); + Object.entries(this._router.currentRoute.queryParams).map( + ([key, value]) => { + if (!searchParams) { + searchParams = new URLSearchParams(); } - ); - if (searchParams) { - postUrl += `?${searchParams.toString()}`; + searchParams.append(key, value); } + ); + + if (searchParams) { + postUrl += `?${searchParams.toString()}`; } - - cancel(this.scheduledReplace); - - this.setProperties({ - lastScrollPos: parseInt($(document).scrollTop(), 10), - scheduledReplace: later( - this, - "_replaceUnlessScrolling", - postUrl, - Ember.Test ? 0 : SCROLL_DELAY - ), - }); } - }, - didTransition() { - const controller = this.controllerFor("topic"); - controller._showFooter(); - const topicId = controller.get("model.id"); - setTopicId(topicId); - return true; - }, - - willTransition() { - this._super(...arguments); cancel(this.scheduledReplace); - this.set("isTransitioning", true); - return true; - }, + + this.setProperties({ + lastScrollPos: parseInt($(document).scrollTop(), 10), + scheduledReplace: later( + this, + "_replaceUnlessScrolling", + postUrl, + Ember.Test ? 0 : SCROLL_DELAY + ), + }); + } + }, + + @action + didTransition() { + const controller = this.controllerFor("topic"); + controller._showFooter(); + const topicId = controller.get("model.id"); + setTopicId(topicId); + return true; + }, + + @action + willTransition() { + this._super(...arguments); + cancel(this.scheduledReplace); + this.set("isTransitioning", true); + return true; }, // replaceState can be very slow on Android Chrome. This function debounces replaceState diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-drafts.js b/app/assets/javascripts/discourse/app/routes/user-activity-drafts.js index 97e49701b4..0eaf79c8b0 100644 --- a/app/assets/javascripts/discourse/app/routes/user-activity-drafts.js +++ b/app/assets/javascripts/discourse/app/routes/user-activity-drafts.js @@ -1,5 +1,6 @@ import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; +import { action } from "@ember/object"; export default DiscourseRoute.extend({ model() { @@ -38,10 +39,9 @@ export default DiscourseRoute.extend({ this.appEvents.off("draft:destroyed", this, this.refresh); }, - actions: { - didTransition() { - this.controllerFor("user-activity")._showFooter(); - return true; - }, + @action + didTransition() { + this.controllerFor("user-activity")._showFooter(); + return true; }, }); diff --git a/app/assets/javascripts/discourse/app/routes/user-badges.js b/app/assets/javascripts/discourse/app/routes/user-badges.js index 3f2d04421a..b88a8bbbaa 100644 --- a/app/assets/javascripts/discourse/app/routes/user-badges.js +++ b/app/assets/javascripts/discourse/app/routes/user-badges.js @@ -1,6 +1,7 @@ import DiscourseRoute from "discourse/routes/discourse"; import UserBadge from "discourse/models/user-badge"; import ViewingActionType from "discourse/mixins/viewing-action-type"; +import { action } from "@ember/object"; export default DiscourseRoute.extend(ViewingActionType, { model() { @@ -19,10 +20,9 @@ export default DiscourseRoute.extend(ViewingActionType, { this.render("user/badges", { into: "user" }); }, - actions: { - didTransition() { - this.controllerFor("application").set("showFooter", true); - return true; - }, + @action + didTransition() { + this.controllerFor("application").set("showFooter", true); + return true; }, }); diff --git a/app/assets/javascripts/discourse/app/routes/user-invited-show.js b/app/assets/javascripts/discourse/app/routes/user-invited-show.js index 81a4c03393..af6f4a3eeb 100644 --- a/app/assets/javascripts/discourse/app/routes/user-invited-show.js +++ b/app/assets/javascripts/discourse/app/routes/user-invited-show.js @@ -1,5 +1,6 @@ import DiscourseRoute from "discourse/routes/discourse"; import Invite from "discourse/models/invite"; +import { action } from "@ember/object"; export default DiscourseRoute.extend({ model(params) { @@ -26,9 +27,8 @@ export default DiscourseRoute.extend({ }); }, - actions: { - triggerRefresh() { - this.refresh(); - }, + @action + triggerRefresh() { + this.refresh(); }, }); diff --git a/app/assets/javascripts/discourse/app/routes/user-notifications.js b/app/assets/javascripts/discourse/app/routes/user-notifications.js index 600ca093bb..01ed463a75 100644 --- a/app/assets/javascripts/discourse/app/routes/user-notifications.js +++ b/app/assets/javascripts/discourse/app/routes/user-notifications.js @@ -1,5 +1,6 @@ import DiscourseRoute from "discourse/routes/discourse"; import ViewingActionType from "discourse/mixins/viewing-action-type"; +import { action } from "@ember/object"; export default DiscourseRoute.extend(ViewingActionType, { controllerName: "user-notifications", @@ -9,11 +10,10 @@ export default DiscourseRoute.extend(ViewingActionType, { this.render("user/notifications"); }, - actions: { - didTransition() { - this.controllerFor("user-notifications")._showFooter(); - return true; - }, + @action + didTransition() { + this.controllerFor("user-notifications")._showFooter(); + return true; }, model(params) { diff --git a/app/assets/javascripts/discourse/app/routes/user.js b/app/assets/javascripts/discourse/app/routes/user.js index 0b54a67a9f..e88075cfd6 100644 --- a/app/assets/javascripts/discourse/app/routes/user.js +++ b/app/assets/javascripts/discourse/app/routes/user.js @@ -1,6 +1,7 @@ import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; import User from "discourse/models/user"; +import { action } from "@ember/object"; export default DiscourseRoute.extend({ titleToken() { @@ -10,14 +11,14 @@ export default DiscourseRoute.extend({ } }, - actions: { - undoRevokeApiKey(key) { - key.undoRevoke(); - }, + @action + undoRevokeApiKey(key) { + key.undoRevoke(); + }, - revokeApiKey(key) { - key.revoke(); - }, + @action + revokeApiKey(key) { + key.revoke(); }, beforeModel() { diff --git a/app/assets/javascripts/discourse/app/routes/users.js b/app/assets/javascripts/discourse/app/routes/users.js index 5af0399c0f..442f2b3b55 100644 --- a/app/assets/javascripts/discourse/app/routes/users.js +++ b/app/assets/javascripts/discourse/app/routes/users.js @@ -3,6 +3,7 @@ import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { Promise } from "rsvp"; +import { action } from "@ember/object"; export default DiscourseRoute.extend({ queryParams: { @@ -55,10 +56,9 @@ export default DiscourseRoute.extend({ ]); }, - actions: { - didTransition() { - this.controllerFor("users")._showFooter(); - return true; - }, + @action + didTransition() { + this.controllerFor("users")._showFooter(); + return true; }, }); From 1fc06520bd7548665d5ab94d57073c3ae1b79394 Mon Sep 17 00:00:00 2001 From: Roman Rizzi Date: Tue, 30 Nov 2021 13:36:14 -0300 Subject: [PATCH 153/168] REFACTOR: Improve support for consolidating notifications. (#14904) * REFACTOR: Improve support for consolidating notifications. Before this commit, we didn't have a single way of consolidating notifications. For notifications like group summaries, we manually removed old ones before creating a new one. On the other hand, we used an after_create callback for likes and group membership requests, which caused unnecessary work, as we need to delete the record we created to replace it with a consolidated one. We now have all the consolidation rules centralized in a single place: the consolidation planner class. Other parts of the app looking to create a consolidable notification can do so by calling Notification#consolidate_or_save!, instead of the default Notification#create! method. Finally, we added two more rules: one for re-using existing group summaries and another for deleting duplicated dashboard problems PMs notifications when the user is tracking the moderator's inbox. Setting the threshold to one forces the planner to apply this rule every time. I plan to add plugin support for adding custom rules in another PR to keep this one relatively small. * DEV: Introduces a plugin API for consolidating notifications. This commit removes the `Notification#filter_by_consolidation_data` scope since plugins could have to define their criteria. The Plan class now receives two blocks, one to query for an already consolidated notification, which we'll try to update, and another to query for existing ones to consolidate. It also receives a consolidation window, which accepts an ActiveSupport::Duration object, and filter notifications created since that value. --- app/controllers/notifications_controller.rb | 2 +- app/models/notification.rb | 32 ++-- app/services/notification_consolidator.rb | 88 ---------- .../consolidate_notifications.rb | 152 ++++++++++++++++++ .../notifications/consolidation_planner.rb | 105 ++++++++++++ app/services/post_alerter.rb | 12 +- lib/discourse_plugin_registry.rb | 2 + lib/plugin/instance.rb | 17 ++ spec/components/plugin/instance_spec.rb | 54 +++++++ spec/jobs/dashboard_stats_spec.rb | 17 ++ spec/models/notification_spec.rb | 52 ++---- .../consolidation_planner_spec.rb | 57 +++++++ spec/services/post_alerter_spec.rb | 27 ++++ 13 files changed, 455 insertions(+), 162 deletions(-) delete mode 100644 app/services/notification_consolidator.rb create mode 100644 app/services/notifications/consolidate_notifications.rb create mode 100644 app/services/notifications/consolidation_planner.rb create mode 100644 spec/services/notifications/consolidation_planner_spec.rb diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index baa9aca3a4..d89917b4f1 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -73,7 +73,7 @@ class NotificationsController < ApplicationController end def create - @notification = Notification.create!(notification_params) + @notification = Notification.consolidate_or_create!(notification_params) render_notification end diff --git a/app/models/notification.rb b/app/models/notification.rb index bf91b350c2..2b8fd37eb0 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -16,34 +16,13 @@ class Notification < ActiveRecord::Base scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id') .where('topics.id IS NULL OR topics.deleted_at IS NULL') } - scope :filter_by_consolidation_data, ->(notification_type, data) { - notifications = where(notification_type: notification_type) - - case notification_type - when types[:liked], types[:liked_consolidated] - key = "display_username" - consolidation_window = SiteSetting.likes_notification_consolidation_window_mins.minutes.ago - when types[:private_message] - key = "topic_title" - consolidation_window = MEMBERSHIP_REQUEST_CONSOLIDATION_WINDOW_HOURS.hours.ago - when types[:membership_request_consolidated] - key = "group_name" - consolidation_window = MEMBERSHIP_REQUEST_CONSOLIDATION_WINDOW_HOURS.hours.ago - end - - notifications = notifications.where("created_at > ? AND data::json ->> '#{key}' = ?", consolidation_window, data[key.to_sym]) if data[key&.to_sym].present? - notifications = notifications.where("data::json ->> 'username2' IS NULL") if notification_type == types[:liked] - - notifications - } - attr_accessor :skip_send_email after_commit :refresh_notification_count, on: [:create, :update, :destroy] + after_commit :send_email, on: :create after_commit(on: :create) do DiscourseEvent.trigger(:notification_created, self) - send_email unless NotificationConsolidator.new(self).consolidate! end before_create do @@ -52,6 +31,15 @@ class Notification < ActiveRecord::Base self.high_priority = self.high_priority || Notification.high_priority_types.include?(self.notification_type) end + def self.consolidate_or_create!(notification_params) + notification = new(notification_params) + consolidation_planner = Notifications::ConsolidationPlanner.new + + consolidated_notification = consolidation_planner.consolidate_or_save!(notification) + + consolidated_notification == :no_plan ? notification.tap(&:save!) : consolidated_notification + end + def self.purge_old! return if SiteSetting.max_notifications_per_user == 0 diff --git a/app/services/notification_consolidator.rb b/app/services/notification_consolidator.rb deleted file mode 100644 index 9ba3dc0ba4..0000000000 --- a/app/services/notification_consolidator.rb +++ /dev/null @@ -1,88 +0,0 @@ -# frozen_string_literal: true - -class NotificationConsolidator - attr_reader :notification, :notification_type, :consolidation_type, :data - - def initialize(notification) - @notification = notification - @notification_type = notification.notification_type - @data = notification.data_hash - - if notification_type == Notification.types[:liked] - @consolidation_type = Notification.types[:liked_consolidated] - @data[:username] = @data[:display_username] - elsif notification_type == Notification.types[:private_message] - post_id = @data[:original_post_id] - return if post_id.blank? - - custom_field = PostCustomField.select(:value).find_by(post_id: post_id, name: "requested_group_id") - return if custom_field.blank? - - group_id = custom_field.value.to_i - group_name = Group.select(:name).find_by(id: group_id)&.name - return if group_name.blank? - - @consolidation_type = Notification.types[:membership_request_consolidated] - @data[:group_name] = group_name - end - end - - def consolidate! - return if SiteSetting.notification_consolidation_threshold.zero? || consolidation_type.blank? - - update_consolidated_notification! || create_consolidated_notification! - end - - def update_consolidated_notification! - consolidated_notification = user_notifications.filter_by_consolidation_data(consolidation_type, data).first - return if consolidated_notification.blank? - - data_hash = consolidated_notification.data_hash - data_hash["count"] += 1 - - Notification.transaction do - consolidated_notification.update!( - data: data_hash.to_json, - read: false, - updated_at: timestamp - ) - notification.destroy! - end - - consolidated_notification - end - - def create_consolidated_notification! - notifications = user_notifications.unread.filter_by_consolidation_data(notification_type, data) - return if notifications.count <= SiteSetting.notification_consolidation_threshold - - consolidated_notification = nil - - Notification.transaction do - timestamp = notifications.last.created_at - data[:count] = notifications.count - - consolidated_notification = Notification.create!( - notification_type: consolidation_type, - user_id: notification.user_id, - data: data.to_json, - updated_at: timestamp, - created_at: timestamp - ) - - notifications.destroy_all - end - - consolidated_notification - end - - private - - def user_notifications - notification.user.notifications - end - - def timestamp - @timestamp ||= Time.zone.now - end -end diff --git a/app/services/notifications/consolidate_notifications.rb b/app/services/notifications/consolidate_notifications.rb new file mode 100644 index 0000000000..83d5f7e901 --- /dev/null +++ b/app/services/notifications/consolidate_notifications.rb @@ -0,0 +1,152 @@ +# frozen_string_literal: true + +# Represents a rule to consolidate a specific notification. +# +# If a consolidated notification already exists, we'll update it instead. +# If it doesn't and creating a new one would match the threshold, we delete existing ones and create a consolidated one. +# Otherwise, save the original one. +# +# Constructor arguments: +# +# - from: The notification type of the unconsolidated notification. e.g. `Notification.types[:private_message]` +# - to: The type the consolidated notification will have. You can use the same value as from to flatten notifications or bump existing ones. +# - threshold: If creating a new notification would match this number, we'll destroy existing ones and create a consolidated one. It also accepts a lambda that returns a number. +# - consolidation_window: Only consolidate notifications created since this value (Pass a ActiveSupport::Duration instance, and we'll call #ago on it). +# - unconsolidated_query_blk: A block with additional queries to apply when fetching for unconsolidated notifications. +# - consolidated_query_blk: A block with additional queries to apply when fetching for a consolidated notification. +# +# Need to call #set_precondition to configure this: +# +# - precondition_blk: A block that receives the mutated data and returns true if we have everything we need to consolidate. +# +# Need to call #set_mutations to configure this: +# +# - set_data_blk: A block that receives the notification data hash and mutates it, adding additional data needed for consolidation. + +module Notifications + class ConsolidateNotifications + def initialize(from:, to:, consolidation_window: nil, unconsolidated_query_blk: nil, consolidated_query_blk: nil, threshold:) + @from = from + @to = to + @threshold = threshold + @consolidation_window = consolidation_window + @consolidated_query_blk = consolidated_query_blk + @unconsolidated_query_blk = unconsolidated_query_blk + @precondition_blk = nil + @set_data_blk = nil + end + + def set_precondition(precondition_blk: nil) + @precondition_blk = precondition_blk + + self + end + + def set_mutations(set_data_blk: nil) + @set_data_blk = set_data_blk + + self + end + + def can_consolidate_data?(notification) + return false if get_threshold.zero? || to.blank? + return false if notification.notification_type != from + + @data = consolidated_data(notification) + + return true if @precondition_blk.nil? + @precondition_blk.call(data) + end + + def consolidate_or_save!(notification) + @data ||= consolidated_data(notification) + return unless can_consolidate_data?(notification) + + update_consolidated_notification!(notification) || + create_consolidated_notification!(notification) || + notification.tap(&:save!) + end + + private + + attr_reader :notification, :from, :to, :data, :threshold, :consolidated_query_blk, :unconsolidated_query_blk, :consolidation_window + + def consolidated_data(notification) + return notification.data_hash if @set_data_blk.nil? + @set_data_blk.call(notification) + end + + def update_consolidated_notification!(notification) + notifications = user_notifications(notification, to) + + if consolidated_query_blk.present? + notifications = consolidated_query_blk.call(notifications, data) + end + consolidated = notifications.first + return if consolidated.blank? + + data_hash = consolidated.data_hash.merge(data) + data_hash[:count] += 1 if data_hash[:count].present? + + # Hack: We don't want to cache the old data if we're about to update it. + consolidated.instance_variable_set(:@data_hash, nil) + + consolidated.update!( + data: data_hash.to_json, + read: false, + updated_at: timestamp + ) + + consolidated + end + + def create_consolidated_notification!(notification) + notifications = user_notifications(notification, from) + if unconsolidated_query_blk.present? + notifications = unconsolidated_query_blk.call(notifications, data) + end + + # Saving the new notification would pass the threshold? Consolidate instead. + count_after_saving_notification = notifications.count + 1 + return if count_after_saving_notification <= get_threshold + + timestamp = notifications.last.created_at + data[:count] = count_after_saving_notification + + consolidated = nil + + Notification.transaction do + notifications.destroy_all + + consolidated = Notification.create!( + notification_type: to, + user_id: notification.user_id, + data: data.to_json, + updated_at: timestamp, + created_at: timestamp + ) + end + + consolidated + end + + def get_threshold + threshold.is_a?(Proc) ? threshold.call : threshold + end + + def user_notifications(notification, type) + notifications = notification.user.notifications + .where(notification_type: type) + + if consolidation_window.present? + notifications = notifications.where('created_at > ?', consolidation_window.ago) + end + + notifications + end + + def timestamp + @timestamp ||= Time.zone.now + end + end +end diff --git a/app/services/notifications/consolidation_planner.rb b/app/services/notifications/consolidation_planner.rb new file mode 100644 index 0000000000..684dcb80e6 --- /dev/null +++ b/app/services/notifications/consolidation_planner.rb @@ -0,0 +1,105 @@ +# frozen_string_literal: true + +module Notifications + class ConsolidationPlanner + def consolidate_or_save!(notification) + plan = plan_for(notification) + return :no_plan if plan.nil? + + plan.consolidate_or_save!(notification) + end + + private + + def plan_for(notification) + consolidation_plans = [liked, dashboard_problems_pm, group_message_summary, group_membership] + consolidation_plans.concat(DiscoursePluginRegistry.notification_consolidation_plans) + + consolidation_plans.detect { |plan| plan.can_consolidate_data?(notification) } + end + + def liked + ConsolidateNotifications.new( + from: Notification.types[:liked], + to: Notification.types[:liked_consolidated], + threshold: -> { SiteSetting.notification_consolidation_threshold }, + consolidation_window: SiteSetting.likes_notification_consolidation_window_mins.minutes, + unconsolidated_query_blk: ->(notifications, data) do + key = 'display_username' + value = data[key.to_sym] + filtered = notifications.where("data::json ->> 'username2' IS NULL") + + filtered = filtered.where("data::json ->> '#{key}' = ?", value) if value + + filtered + end, + consolidated_query_blk: filtered_by_data_attribute('display_username') + ).set_mutations( + set_data_blk: ->(notification) do + data = notification.data_hash + data.merge(username: data[:display_username]) + end + ) + end + + def group_membership + ConsolidateNotifications.new( + from: Notification.types[:private_message], + to: Notification.types[:membership_request_consolidated], + threshold: -> { SiteSetting.notification_consolidation_threshold }, + consolidation_window: Notification::MEMBERSHIP_REQUEST_CONSOLIDATION_WINDOW_HOURS.hours, + unconsolidated_query_blk: filtered_by_data_attribute('topic_title'), + consolidated_query_blk: filtered_by_data_attribute('group_name') + ).set_precondition( + precondition_blk: ->(data) { data[:group_name].present? } + ).set_mutations( + set_data_blk: ->(notification) do + data = notification.data_hash + post_id = data[:original_post_id] + custom_field = PostCustomField.select(:value).find_by(post_id: post_id, name: "requested_group_id") + group_id = custom_field&.value + group_name = group_id.present? ? Group.select(:name).find_by(id: group_id.to_i)&.name : nil + + data[:group_name] = group_name + data + end + ) + end + + def group_message_summary + ConsolidateNotifications.new( + from: Notification.types[:group_message_summary], + to: Notification.types[:group_message_summary], + unconsolidated_query_blk: filtered_by_data_attribute('group_id'), + consolidated_query_blk: filtered_by_data_attribute('group_id'), + threshold: 1 # We should always apply this plan to refresh the summary stats + ).set_precondition( + precondition_blk: ->(data) { data[:group_id].present? } + ) + end + + def dashboard_problems_pm + ConsolidateNotifications.new( + from: Notification.types[:private_message], + to: Notification.types[:private_message], + threshold: 1, + unconsolidated_query_blk: filtered_by_data_attribute('topic_title'), + consolidated_query_blk: filtered_by_data_attribute('topic_title') + ).set_precondition( + precondition_blk: ->(data) do + data[:topic_title] == I18n.t("system_messages.dashboard_problems.subject_template") + end + ) + end + + def filtered_by_data_attribute(attribute_name) + ->(notifications, data) do + if (value = data[attribute_name.to_sym]) + notifications.where("data::json ->> '#{attribute_name}' = ?", value.to_s) + else + notifications + end + end + end + end +end diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb index 31efae476c..d311391aba 100644 --- a/app/services/post_alerter.rb +++ b/app/services/post_alerter.rb @@ -327,15 +327,9 @@ class PostAlerter stat = stats.find { |s| s[:group_id] == group_id } return unless stat && stat[:inbox_count] > 0 - notification_type = Notification.types[:group_message_summary] - DistributedMutex.synchronize("group_message_notify_#{user.id}") do - Notification.where(notification_type: notification_type, user_id: user.id).each do |n| - n.destroy if n.data_hash[:group_id] == stat[:group_id] - end - - Notification.create( - notification_type: notification_type, + Notification.consolidate_or_create!( + notification_type: Notification.types[:group_message_summary], user_id: user.id, data: { group_id: stat[:group_id], @@ -509,7 +503,7 @@ class PostAlerter end # Create the notification - created = user.notifications.create!( + created = user.notifications.consolidate_or_create!( notification_type: type, topic_id: post.topic_id, post_number: post.post_number, diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb index 53a05aa4b4..10642a73e5 100644 --- a/lib/discourse_plugin_registry.rb +++ b/lib/discourse_plugin_registry.rb @@ -93,6 +93,8 @@ class DiscoursePluginRegistry define_filtered_register :push_notification_filters + define_filtered_register :notification_consolidation_plans + def self.register_auth_provider(auth_provider) self.auth_providers << auth_provider end diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb index e59a6fbc05..d24e49e374 100644 --- a/lib/plugin/instance.rb +++ b/lib/plugin/instance.rb @@ -976,6 +976,23 @@ class Plugin::Instance DiscoursePluginRegistry.register_reviewable_score_link({ reason: reason.to_sym, setting: setting_name }, self) end + # If your plugin creates notifications, and you'd like to consolidate/collapse similar ones, + # you're in the right place. + # This method receives a plan object, which must be an instance of `Notifications::ConsolidateNotifications`. + # + # Instead of using `Notification#create!`, you should use `Notification#consolidate_or_save!`, + # which will automatically pick your plan and apply it, updating an already consolidated notification, + # consolidating multiple ones, or creating a regular one. + # + # The rule object is quite complex. We strongly recommend you write tests to ensure your plugin consolidates notifications correctly. + # + # - Plan's documentation: https://github.com/discourse/discourse/blob/main/app/services/notifications/consolidate_notifications.rb + # - Base plans: https://github.com/discourse/discourse/blob/main/app/services/notifications/consolidation_planner.rb + def register_notification_consolidation_plan(plan) + raise ArgumentError.new("Not a consolidation plan") if plan.class != Notifications::ConsolidateNotifications + DiscoursePluginRegistry.register_notification_consolidation_plan(plan, self) + end + protected def self.js_path diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb index bdd1c835da..506ac7e09e 100644 --- a/spec/components/plugin/instance_spec.rb +++ b/spec/components/plugin/instance_spec.rb @@ -668,4 +668,58 @@ describe Plugin::Instance do Site.categories_callbacks.clear end end + + describe '#register_notification_consolidation_plan' do + let(:plugin) { Plugin::Instance.new } + fab!(:topic) { Fabricate(:topic) } + + after do + DiscoursePluginRegistry.reset_register!(:notification_consolidation_plans) + end + + it 'fails when the received object is not a consolidation plan' do + expect { plugin.register_notification_consolidation_plan(Object.new) }.to raise_error(ArgumentError) + end + + it 'registers a consolidation plan and uses it' do + plan = Notifications::ConsolidateNotifications.new( + from: Notification.types[:code_review_commit_approved], + to: Notification.types[:code_review_commit_approved], + threshold: 1, + consolidation_window: 1.minute, + unconsolidated_query_blk: ->(notifications, _data) do + notifications.where("(data::json ->> 'consolidated') IS NULL") + end, + consolidated_query_blk: ->(notifications, _data) do + notifications.where("(data::json ->> 'consolidated') IS NOT NULL") + end + ).set_mutations( + set_data_blk: ->(notification) do + notification.data_hash.merge(consolidated: true) + end + ) + + plugin.register_notification_consolidation_plan(plan) + + create_notification! + create_notification! + + expect(commit_approved_notifications.count).to eq(1) + consolidated_notification = commit_approved_notifications.last + expect(consolidated_notification.data_hash[:consolidated]).to eq(true) + end + + def commit_approved_notifications + Notification.where(user: topic.user, notification_type: Notification.types[:code_review_commit_approved]) + end + + def create_notification! + Notification.consolidate_or_create!( + notification_type: Notification.types[:code_review_commit_approved], + topic_id: topic.id, + user: topic.user, + data: {} + ) + end + end end diff --git a/spec/jobs/dashboard_stats_spec.rb b/spec/jobs/dashboard_stats_spec.rb index e4b2fdafc3..3ffb3300ea 100644 --- a/spec/jobs/dashboard_stats_spec.rb +++ b/spec/jobs/dashboard_stats_spec.rb @@ -33,6 +33,23 @@ describe ::Jobs::DashboardStats do expect(new_topic.title).to eq(old_topic.title) end + it 'consolidates notifications when not tracking admins group' do + Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, 3.days.ago) + Jobs.run_immediately! + + admin = Fabricate(:admin) + Group[:admins].add(admin) + + described_class.new.execute({}) + clear_recently_sent! + new_topic = described_class.new.execute({}).topic + notifications = Notification.where(user: admin, notification_type: Notification.types[:private_message]) + + expect(notifications.count).to eq(1) + from_topic_id = Post.select(:topic_id).find_by(id: notifications.last.data_hash[:original_post_id]).topic_id + expect(from_topic_id).to eq(new_topic.id) + end + it 'duplicates message if previous one has replies' do Discourse.redis.setex(AdminDashboardData.problems_started_key, 14.days.to_i, 3.days.ago) expect { described_class.new.execute({}) }.to change { Topic.count }.by(1) diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb index 2e91a5e728..a99cde5c04 100644 --- a/spec/models/notification_spec.rb +++ b/spec/models/notification_spec.rb @@ -355,36 +355,6 @@ describe Notification do end end - describe '.filter_by_consolidation_data' do - let(:post) { Fabricate(:post) } - fab!(:user) { Fabricate(:user) } - - before do - PostActionNotifier.enable - end - - it 'should return the right notifications' do - expect(Notification.filter_by_consolidation_data( - Notification.types[:liked], display_username: user.username_lower - )).to eq([]) - - expect do - PostAlerter.post_created(Fabricate(:basic_reply, - user: user, - topic: post.topic - )) - - PostActionCreator.like(user, post) - end.to change { Notification.count }.by(2) - - expect(Notification.filter_by_consolidation_data( - Notification.types[:liked], display_username: user.username_lower - )).to contain_exactly( - Notification.find_by(notification_type: Notification.types[:liked]) - ) - end - end - describe "do not disturb" do it "calls NotificationEmailer.process_notification when user is not in 'do not disturb'" do user = Fabricate(:user) @@ -482,7 +452,7 @@ describe Notification do fab!(:post) { Fabricate(:post) } def create_membership_request_notification - Notification.create( + Notification.consolidate_or_create!( notification_type: Notification.types[:private_message], user_id: user.id, data: { @@ -500,23 +470,21 @@ describe Notification do end it 'should consolidate membership requests to a new notification' do - notification = create_membership_request_notification - notification.reload + original_notification = create_membership_request_notification + starting_count = SiteSetting.notification_consolidation_threshold - notification = create_membership_request_notification - expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound) + consolidated_notification = create_membership_request_notification + expect { original_notification.reload }.to raise_error(ActiveRecord::RecordNotFound) - notification = Notification.last - expect(notification.notification_type).to eq(Notification.types[:membership_request_consolidated]) + expect(consolidated_notification.notification_type).to eq(Notification.types[:membership_request_consolidated]) - data = notification.data_hash + data = consolidated_notification.data_hash expect(data[:group_name]).to eq(group.name) - expect(data[:count]).to eq(4) + expect(data[:count]).to eq(starting_count + 1) - notification = create_membership_request_notification - expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound) + updated_consolidated_notification = create_membership_request_notification - expect(Notification.last.data_hash[:count]).to eq(5) + expect(updated_consolidated_notification.data_hash[:count]).to eq(starting_count + 2) end it 'consolidates membership requests with "processed" false if user is in DND' do diff --git a/spec/services/notifications/consolidation_planner_spec.rb b/spec/services/notifications/consolidation_planner_spec.rb new file mode 100644 index 0000000000..4597c1e5fb --- /dev/null +++ b/spec/services/notifications/consolidation_planner_spec.rb @@ -0,0 +1,57 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe Notifications::ConsolidationPlanner do + describe '#consolidate_or_save!' do + let(:threshold) { 1 } + fab!(:user) { Fabricate(:user) } + let(:like_user) { 'user1' } + + before { SiteSetting.notification_consolidation_threshold = threshold } + + it "does nothing it haven't passed the consolidation threshold yet" do + notification = build_notification(:liked, { display_username: like_user }) + + saved_like = subject.consolidate_or_save!(notification) + + expect(saved_like.id).to be_present + expect(saved_like.notification_type).to eq(Notification.types[:liked]) + end + + it 'consolidates multiple notifications into a new one' do + first_notification = Fabricate(:notification, user: user, notification_type: Notification.types[:liked], data: { display_username: like_user }.to_json) + notification = build_notification(:liked, { display_username: like_user }) + + consolidated_like = subject.consolidate_or_save!(notification) + + expect(consolidated_like.id).not_to eq(first_notification.id) + expect(consolidated_like.notification_type).to eq(Notification.types[:liked_consolidated]) + data = JSON.parse(consolidated_like.data) + expect(data['count']).to eq(threshold + 1) + end + + it 'updates the notification if we already consolidated it' do + count = 5 + Fabricate(:notification, + user: user, notification_type: Notification.types[:liked_consolidated], + data: { count: count, display_username: like_user }.to_json + ) + notification = build_notification(:liked, { display_username: like_user }) + + updated = subject.consolidate_or_save!(notification) + + expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound) + data = JSON.parse(updated.data) + expect(data['count']).to eq(count + 1) + end + end + + def build_notification(type_sym, data) + Fabricate.build(:notification, user: user, notification_type: Notification.types[type_sym], data: data.to_json) + end + + def plan_for(notification) + subject.plan_for(notification) + end +end diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb index 65c6714bdd..edc0a044e6 100644 --- a/spec/services/post_alerter_spec.rb +++ b/spec/services/post_alerter_spec.rb @@ -102,6 +102,33 @@ describe PostAlerter do notification_payload = JSON.parse(group_summary_notification.first.data) expect(notification_payload["group_name"]).to eq(group.name) end + + it 'consolidates group summary notifications by bumping an existing one' do + TopicUser.change(user2.id, pm.id, notification_level: TopicUser.notification_levels[:tracking]) + PostAlerter.post_created(op) + + group_summary_notification = Notification.where( + user_id: user2.id, + notification_type: Notification.types[:group_message_summary] + ).last + starting_count = group_summary_notification.data_hash[:inbox_count] + + expect(starting_count).to eq(1) + + another_pm = Fabricate(:topic, archetype: 'private_message', category_id: nil, allowed_groups: [group]) + another_post = Fabricate(:post, user: another_pm.user, topic: another_pm) + TopicUser.change(user2.id, another_pm.id, notification_level: TopicUser.notification_levels[:tracking]) + + PostAlerter.post_created(another_post) + consolidated_summary = Notification.where( + user_id: user2.id, + notification_type: Notification.types[:group_message_summary] + ).last + updated_inbox_count = consolidated_summary.data_hash[:inbox_count] + + expect(group_summary_notification.id).to eq(consolidated_summary.id) + expect(updated_inbox_count).to eq(starting_count + 1) + end end end From c0781d7d233fd1df546ccbd87ed80fe70a9dc805 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 30 Nov 2021 17:40:32 +0100 Subject: [PATCH 154/168] DEV: Replace bent with node-fetch in bootstrap (#15139) Drops the `acceptedStatusCodes` array. --- .../discourse/lib/bootstrap-json/index.js | 43 ++++------ app/assets/javascripts/discourse/package.json | 2 +- app/assets/javascripts/yarn.lock | 86 ++++++------------- 3 files changed, 45 insertions(+), 86 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js index ece7a60629..87342b34d7 100644 --- a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js +++ b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js @@ -1,8 +1,7 @@ "use strict"; const express = require("express"); -const bent = require("bent"); -const getJSON = bent("json"); +const fetch = require("node-fetch"); const { encode } = require("html-entities"); const cleanBaseURL = require("clean-base-url"); const path = require("path"); @@ -123,7 +122,9 @@ function bodyFooter(buffer, bootstrap, headers) { let v = generateUID(); buffer.push(` - + `); } @@ -175,7 +176,7 @@ async function applyBootstrap(bootstrap, template, response, baseURL) { } Object.keys(BUILDERS).forEach((id) => { - template = replaceIn(bootstrap, template, id, response, baseURL); + template = replaceIn(bootstrap, template, id, response.headers, baseURL); }); return template; } @@ -193,7 +194,8 @@ async function buildFromBootstrap(proxy, baseURL, req, response) { url += req.url.substr(queryLoc); } - const json = await getJSON(url, null, req.headers); + const res = await fetch(url, { headers: req.headers }); + const json = await res.json(); return applyBootstrap(json.bootstrap, template, response, baseURL); } catch (error) { @@ -230,33 +232,24 @@ async function handleRequest(proxy, baseURL, req, res) { req.headers["X-Discourse-Asset-Path"] = req.path; } - const acceptedStatusCodes = [ - 200, - 201, - 301, - 302, - 303, - 307, - 308, - 404, - 403, - 422, - 500, - ]; - const proxyRequest = bent(req.method, acceptedStatusCodes); - const requestBody = req.method === "GET" ? null : req.body; - const response = await proxyRequest(url, requestBody, req.headers); + const response = await fetch(url, { + method: req.method, + body: /GET|HEAD/.test(req.method) ? null : req.body, + headers: req.headers, + }); - res.set(response.headers); + response.headers.forEach((value, header) => { + res.set(header, value); + }); res.set("content-encoding", null); - const { location } = response.headers; + const location = response.headers.get("location"); if (location) { const newLocation = location.replace(proxy, `http://${originalHost}`); res.set("location", newLocation); } - const csp = response.headers["content-security-policy"]; + const csp = response.headers.get("content-security-policy"); if (csp) { const newCSP = csp.replace( new RegExp(proxy, "g"), @@ -265,7 +258,7 @@ async function handleRequest(proxy, baseURL, req, res) { res.set("content-security-policy", newCSP); } - if (response.headers["x-discourse-bootstrap-required"] === "true") { + if (response.headers.get("x-discourse-bootstrap-required") === "true") { const html = await buildFromBootstrap(proxy, baseURL, req, response); res.set("content-type", "text/html"); res.send(html); diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index ef1539fb10..59735ab571 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -29,7 +29,6 @@ "@uppy/utils": "^4.0.3", "@uppy/xhr-upload": "^2.0.4", "admin": "^1.0.0", - "bent": "^7.3.12", "broccoli-asset-rev": "^3.0.0", "deepmerge": "^4.2.2", "discourse-common": "^1.0.0", @@ -58,6 +57,7 @@ "loader.js": "^4.7.0", "message-bus-client": "^3.3.0", "messageformat": "0.1.5", + "node-fetch": "^2.6.6", "pretender": "^3.4.7", "pretty-text": "^1.0.0", "qunit": "^2.14.0", diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock index 333a1e7f5e..7be414245a 100644 --- a/app/assets/javascripts/yarn.lock +++ b/app/assets/javascripts/yarn.lock @@ -2814,15 +2814,6 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -bent@^7.3.12: - version "7.3.12" - resolved "https://registry.yarnpkg.com/bent/-/bent-7.3.12.tgz#e0a2775d4425e7674c64b78b242af4f49da6b035" - integrity sha512-T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w== - dependencies: - bytesish "^0.4.1" - caseless "~0.12.0" - is-stream "^2.0.0" - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -3696,11 +3687,6 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -bytesish@^0.4.1: - version "0.4.4" - resolved "https://registry.yarnpkg.com/bytesish/-/bytesish-0.4.4.tgz#f3b535a0f1153747427aee27256748cff92347e6" - integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ== - cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" @@ -4471,14 +4457,7 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.1.1: dependencies: ms "^2.1.1" -debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@^4.2.0: +debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== @@ -4829,40 +4808,7 @@ ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.6.0: ember-cli-version-checker "^2.1.2" semver "^5.5.0" -ember-cli-babel@^7.0.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.2, ember-cli-babel@^7.7.3: - version "7.26.3" - resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.3.tgz#e93ce7ec458208894d10844cf76e41cc06fdbeb6" - integrity sha512-ZCs0g99d3kYaHs1+HT33oMY7/K+nLCAAv7dCLxsMzg7cQf55O6Pq4ZKnWEr3IHVs33xbJFnEb9prt1up36QVnw== - dependencies: - "@babel/core" "^7.12.0" - "@babel/helper-compilation-targets" "^7.12.0" - "@babel/plugin-proposal-class-properties" "^7.13.0" - "@babel/plugin-proposal-decorators" "^7.13.5" - "@babel/plugin-transform-modules-amd" "^7.13.0" - "@babel/plugin-transform-runtime" "^7.13.9" - "@babel/plugin-transform-typescript" "^7.13.0" - "@babel/polyfill" "^7.11.5" - "@babel/preset-env" "^7.12.0" - "@babel/runtime" "7.12.18" - amd-name-resolver "^1.3.1" - babel-plugin-debug-macros "^0.3.4" - babel-plugin-ember-data-packages-polyfill "^0.1.2" - babel-plugin-ember-modules-api-polyfill "^3.5.0" - babel-plugin-module-resolver "^3.2.0" - broccoli-babel-transpiler "^7.8.0" - broccoli-debug "^0.6.4" - broccoli-funnel "^2.0.2" - broccoli-source "^2.1.2" - clone "^2.1.2" - ember-cli-babel-plugin-helpers "^1.1.1" - ember-cli-version-checker "^4.1.0" - ensure-posix-path "^1.0.2" - fixturify-project "^1.10.0" - resolve-package-path "^3.1.0" - rimraf "^3.0.1" - semver "^5.5.0" - -ember-cli-babel@^7.21.0, ember-cli-babel@^7.26.4: +ember-cli-babel@^7.0.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.2, ember-cli-babel@^7.26.4, ember-cli-babel@^7.7.3: version "7.26.6" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39" integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ== @@ -8857,10 +8803,12 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" -node-fetch@^2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== +node-fetch@^2.6.0, node-fetch@^2.6.6: + version "2.6.6" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89" + integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA== + dependencies: + whatwg-url "^5.0.0" node-int64@^0.4.0: version "0.4.0" @@ -11324,6 +11272,11 @@ tr46@^2.0.2: dependencies: punycode "^2.1.1" +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + tree-sync@^1.2.2: version "1.4.0" resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.4.0.tgz#314598d13abaf752547d9335b8f95d9a137100d6" @@ -11817,6 +11770,11 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + webidl-conversions@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" @@ -11890,6 +11848,14 @@ whatwg-mimetype@^2.3.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + whatwg-url@^8.0.0, whatwg-url@^8.5.0: version "8.5.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3" From 7ce6971539eae3f1baddeabd2edd3f12ecba7a1a Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 30 Nov 2021 17:41:04 +0100 Subject: [PATCH 155/168] DEV: Add drop-date to drop-dateless deprecations (#15133) --- app/assets/javascripts/discourse-common/addon/resolver.js | 2 +- app/assets/javascripts/discourse/app/components/mobile-nav.js | 1 + app/assets/javascripts/discourse/app/lib/formatter.js | 1 + app/assets/javascripts/discourse/app/lib/link-hashtags.js | 1 + app/assets/javascripts/discourse/app/lib/link-mentions.js | 1 + app/assets/javascripts/discourse/app/models/store.js | 1 + .../discourse/app/pre-initializers/inject-discourse-objects.js | 2 ++ app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js | 2 +- .../javascripts/select-kit/addon/components/select-kit.js | 2 +- 9 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js index 22d13c56ca..e07793bfb9 100644 --- a/app/assets/javascripts/discourse-common/addon/resolver.js +++ b/app/assets/javascripts/discourse-common/addon/resolver.js @@ -65,7 +65,7 @@ export function buildResolver(baseName) { if (fullName === "app-events:main") { deprecated( "`app-events:main` has been replaced with `service:app-events`", - { since: "2.4.0" } + { since: "2.4.0", dropFrom: "2.9.0.beta1" } ); return "service:app-events"; } diff --git a/app/assets/javascripts/discourse/app/components/mobile-nav.js b/app/assets/javascripts/discourse/app/components/mobile-nav.js index 8648020a20..bdbb2cc85a 100644 --- a/app/assets/javascripts/discourse/app/components/mobile-nav.js +++ b/app/assets/javascripts/discourse/app/components/mobile-nav.js @@ -17,6 +17,7 @@ export default Component.extend({ if (this.currentPath) { deprecated("{{mobile-nav}} no longer requires the currentPath property", { since: "2.7.0.beta4", + dropFrom: "2.9.0.beta1", }); } }, diff --git a/app/assets/javascripts/discourse/app/lib/formatter.js b/app/assets/javascripts/discourse/app/lib/formatter.js index 90ddf88e1d..3a57516b18 100644 --- a/app/assets/javascripts/discourse/app/lib/formatter.js +++ b/app/assets/javascripts/discourse/app/lib/formatter.js @@ -55,6 +55,7 @@ export function updateRelativeAge(elems) { elems = elems.toArray(); deprecated("updateRelativeAge now expects a DOM NodeList", { since: "2.8.0.beta7", + dropFrom: "2.9.0.beta1", }); } diff --git a/app/assets/javascripts/discourse/app/lib/link-hashtags.js b/app/assets/javascripts/discourse/app/lib/link-hashtags.js index 7d1fa26320..da3391d5d4 100644 --- a/app/assets/javascripts/discourse/app/lib/link-hashtags.js +++ b/app/assets/javascripts/discourse/app/lib/link-hashtags.js @@ -14,6 +14,7 @@ export function linkSeenHashtags(elem) { deprecated("linkSeenHashtags now expects a DOM node as first parameter", { since: "2.8.0.beta7", + dropFrom: "2.9.0.beta1", }); } diff --git a/app/assets/javascripts/discourse/app/lib/link-mentions.js b/app/assets/javascripts/discourse/app/lib/link-mentions.js index 8abfc47e5b..229b2c71f7 100644 --- a/app/assets/javascripts/discourse/app/lib/link-mentions.js +++ b/app/assets/javascripts/discourse/app/lib/link-mentions.js @@ -73,6 +73,7 @@ export function linkSeenMentions(elem, siteSettings) { deprecated("linkSeenMentions now expects a DOM node as first parameter", { since: "2.8.0.beta7", + dropFrom: "2.9.0.beta1", }); } diff --git a/app/assets/javascripts/discourse/app/models/store.js b/app/assets/javascripts/discourse/app/models/store.js index ca01224fb8..42523e3e76 100644 --- a/app/assets/javascripts/discourse/app/models/store.js +++ b/app/assets/javascripts/discourse/app/models/store.js @@ -5,5 +5,6 @@ deprecated( `"discourse/models/store" import is deprecated, use "discourse/services/store" instead`, { since: "2.8.0.beta8", + dropFrom: "2.9.0.beta1", } ); diff --git a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js index a9702e2ce4..6f82a8ca76 100644 --- a/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js +++ b/app/assets/javascripts/discourse/app/pre-initializers/inject-discourse-objects.js @@ -37,6 +37,7 @@ export default { create() { deprecated(`"store:main" is deprecated, use "service:store" instead`, { since: "2.8.0.beta8", + dropFrom: "2.9.0.beta1", }); return container.lookup("service:store"); @@ -85,6 +86,7 @@ export default { `"search-service:main" is deprecated, use "service:search" instead`, { since: "2.8.0.beta8", + dropFrom: "2.9.0.beta1", } ); diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js index 58410713f6..8591ec77fc 100644 --- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js +++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js @@ -204,7 +204,7 @@ export function acceptance(name, optionsOrCallback) { } else if (typeof optionsOrCallback === "object") { deprecated( `${name}: The second parameter to \`acceptance\` should be a function that encloses your tests.`, - { since: "2.6.0" } + { since: "2.6.0", dropFrom: "2.9.0.beta1" } ); options = optionsOrCallback; } diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js index 8aca155af8..db9a181310 100644 --- a/app/assets/javascripts/select-kit/addon/components/select-kit.js +++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js @@ -1042,7 +1042,7 @@ export default Component.extend( discourseSetup && discourseSetup.getAttribute("data-environment") === "development" ) { - deprecated(text, { since: "v2.4.0" }); + deprecated(text, { since: "v2.4.0", dropFrom: "2.9.0.beta1" }); } }, From ac79c5efc61d259705eeb487ca21d0ec3c535807 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 30 Nov 2021 17:41:22 +0100 Subject: [PATCH 156/168] UX: Tweak composer styling (#15117) * Even margins * Slightly more muted and unified borders, separators, and icons * Editor and preview area have same height --- .../stylesheets/common/base/compose.scss | 42 +++++++++----- app/assets/stylesheets/common/d-editor.scss | 8 +-- .../common/select-kit/composer-actions.scss | 3 +- app/assets/stylesheets/desktop/compose.scss | 58 +++++++------------ 4 files changed, 54 insertions(+), 57 deletions(-) diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index 5302f5a90d..b549cc3164 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -32,7 +32,7 @@ display: none; padding-left: 10px; .spinner { - margin-left: 5px; + margin-left: 8px; border-color: var(--secondary); border-right-color: transparent; } @@ -63,7 +63,7 @@ .composer-controls { margin-left: auto; display: flex; - padding-right: 5px; + padding-right: 8px; .toggle-toolbar { display: none; } @@ -94,23 +94,24 @@ .reply-to { color: var(--primary-high); - margin: 5px 0 10px 0; + margin-bottom: 8px; display: flex; align-items: center; + justify-content: flex-end; .reply-details { - max-width: calc(100% - 175px); flex: 1 1 auto; display: flex; align-items: center; white-space: nowrap; + overflow: auto; .d-icon { color: var(--primary-medium); } } .composer-action-title { - display: inline-flex; + display: flex; align-items: center; width: auto; max-width: 100%; @@ -127,7 +128,7 @@ .topic-link, .user-link, .post-link { - margin-right: 5px; + margin-right: 8px; } .username { @@ -140,16 +141,22 @@ } .d-icon { - margin-right: 5px; + margin-right: 8px; } img.avatar { margin-right: 3px; } } + .composer-controls { display: flex; - margin-left: auto; + margin-left: 8px; + + .d-icon { + color: var(--primary-medium); + } + .toggle-minimize { order: 2; } @@ -189,7 +196,7 @@ display: flex; width: 100%; align-items: center; - margin-bottom: 5px; + margin-bottom: 8px; position: relative; &.with-preview { width: 50%; @@ -223,7 +230,7 @@ display: flex; flex: 1 0 40%; max-width: 40%; - margin: 0 0 5px 10px; + margin: 0 0 8px 8px; @media screen and (max-width: 955px) { flex: 1 0 100%; margin-left: 0; @@ -280,12 +287,12 @@ margin-bottom: 0; display: flex; input { - margin-right: 5px; + margin-right: 8px; } } #reply-title { - margin: 0 0 5px 0; + margin: 0 0 8px 0; flex-basis: 50%; width: unset; &:focus { @@ -315,14 +322,14 @@ .submit-panel { display: flex; flex-shrink: 0; - margin: 7px 0 3px 0; + margin-top: 8px; } .save-or-cancel { - flex-basis: 50%; display: flex; align-items: center; - margin-right: auto; + flex: 1 1 auto; + .btn-primary { flex: 0 0 auto; } @@ -537,7 +544,12 @@ body:not(.ios-safari-composer-hacks) { .toggle-preview { transition: all 0.33s ease-out; + &.active { transform: rotate(180deg); } + + .d-icon { + color: var(--primary-medium); + } } diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss index f4b0e6e68d..79d1462eef 100644 --- a/app/assets/stylesheets/common/d-editor.scss +++ b/app/assets/stylesheets/common/d-editor.scss @@ -20,7 +20,7 @@ flex-direction: column; background-color: var(--secondary); position: relative; - border: 1px solid var(--primary-medium); + border: 1px solid var(--primary-low); textarea { background: transparent; @@ -54,9 +54,6 @@ overflow: auto; cursor: default; -webkit-overflow-scrolling: touch; - // the below gives text little space to overflow without being cropped (e.g., Õ in headings) - padding-top: 1em; - margin-top: -1em; } .d-editor-input, @@ -306,8 +303,9 @@ .d-editor-spacer { height: 1em; display: inline-block; - border-left: 1px solid var(--primary-low-mid); + border-left: 1px solid var(--primary-low); margin: 0 0.25em; + .mobile-view & { display: none; } diff --git a/app/assets/stylesheets/common/select-kit/composer-actions.scss b/app/assets/stylesheets/common/select-kit/composer-actions.scss index a1ff8a9e42..4ce7fbc825 100644 --- a/app/assets/stylesheets/common/select-kit/composer-actions.scss +++ b/app/assets/stylesheets/common/select-kit/composer-actions.scss @@ -6,9 +6,10 @@ background: none; outline: none; padding: 0; - margin-right: 5px; + margin-right: 8px; border: 1px solid var(--primary-low); min-height: unset; + .d-icon { padding: 5px 6px; } diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index e61e090438..b5120e6c0f 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -1,10 +1,11 @@ #reply-control { .reply-area { margin: 0 auto; - padding: 5px 15px; + padding: 8px; box-sizing: border-box; - height: calc(100% - 11px); + height: 100%; width: 100%; + .submit-panel { flex-wrap: wrap; align-items: center; @@ -20,7 +21,7 @@ .title-and-category { flex-wrap: nowrap; // force title and tags on same line for PMs .mini-tag-chooser { - margin-bottom: 5px; // match title input margin + margin-bottom: 8px; // match title input margin flex: 0 0 auto; margin-left: 1%; // matches margin between category and tag input width: 39%; @@ -55,29 +56,6 @@ } } -.edit-title { - --overflow-buffer: 1em; - // this gives text little space to overflow without being cropped (e.g., Õ in headings) - - .d-editor-preview-wrapper { - margin-top: calc(-41px - var(--overflow-buffer)); - padding-top: var(--overflow-buffer); - } - &:not(.private-message) { - .d-editor-preview-wrapper { - @media screen and (max-width: 955px) { - margin-top: calc(-75px - var(--overflow-buffer)); - } - } - } - - .with-tags { - .d-editor-preview-wrapper { - margin-top: calc(-75px - var(--overflow-buffer)); - } - } -} - .closed { .grippie { display: none; @@ -89,12 +67,14 @@ cursor: row-resize; padding: 4px 0; background: var(--tertiary); + margin-top: -11px; + &:before { content: ""; display: block; - width: 27px; + width: 24px; margin: auto; - border-top: 3px double var(--secondary); + border-top: 3px double var(--tertiary-medium); } } } @@ -103,6 +83,7 @@ .open { .grippie { padding: 7px 0; + margin-top: -17px; } } } @@ -116,16 +97,16 @@ .composer-popup { box-sizing: border-box; position: absolute; - width: calc(50% - 30px); - max-width: 724px; - top: 21px; // grippie height + .reply-to margin-top + .reply-area padding-top - bottom: 10px; + width: calc(49% - 8px); + top: 8px; // .reply-to margin-top + .reply-area padding-top + bottom: 8px; left: 51%; overflow-y: auto; z-index: z("composer", "popover"); - padding: 10px 10px 35px 10px; + padding: 8px 8px 32px 8px; box-shadow: shadow("dropdown"); background: var(--highlight-medium); + .hide-preview & { z-index: z("composer", "dropdown") + 1; } @@ -282,26 +263,31 @@ a.toggle-preview { .profiler-results { display: none; } + #reply-control { &.fullscreen { // important needed because of inline styles when height is changed manually with grippie height: 100vh !important; max-height: 100%; // prevents devices from miscalculating using vh + z-index: z("header") + 1; + @supports (--custom: property) { height: calc(var(--composer-vh, 1vh) * 100) !important; } - z-index: z("header") + 1; + .d-editor-preview-wrapper { margin-top: 1%; } + .reply-to { border-bottom: 1px solid var(--primary-low); - padding-bottom: 3px; - margin: 0; + margin-bottom: 0; + .composer-controls { margin-right: 0; } } + .d-editor-textarea-wrapper { border: none; } From feb9a3675dc8812786d6e97fb1d53b96192753d9 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 30 Nov 2021 19:50:28 +0100 Subject: [PATCH 157/168] UX: Tweak mobile composer styling (#15141) A followup to #15117 --- app/assets/stylesheets/mobile/compose.scss | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss index 205ec8977c..08171d7d20 100644 --- a/app/assets/stylesheets/mobile/compose.scss +++ b/app/assets/stylesheets/mobile/compose.scss @@ -8,12 +8,10 @@ #reply-control { z-index: z("mobile-composer"); + .reply-area { - padding: 0 10px; - padding-bottom: env(safe-area-inset-bottom); - @media screen and (max-width: 374px) { - padding: 0 5px; - } + padding: 6px; + padding-bottom: max(env(safe-area-inset-bottom), 6px); flex-grow: 1; } @@ -33,7 +31,9 @@ } .reply-to { - margin: 5px 0; + justify-content: space-between; + margin-bottom: 6px; + .reply-details { max-width: calc(100% - 75px); } @@ -81,12 +81,13 @@ } .category-input { - margin-bottom: 5px; + margin-bottom: 6px; } .submit-panel { - margin-bottom: 5px; + margin-top: 6px; align-items: baseline; + .save-or-cancel { flex: 1 1 auto; #draft-status, From 2eb162e25bc830fb8e52ce52c9fd6087d750f957 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 30 Nov 2021 18:57:57 +0000 Subject: [PATCH 158/168] FEATURE: Show user cards for 'replying...' users (#15142) Also removes some unneeded parameters from the `avatar` helper. --- .../templates/components/composer-presence-display.hbs | 2 +- .../discourse/templates/components/topic-presence-display.hbs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs index 59ccc66367..e55bd31893 100644 --- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs +++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs @@ -2,7 +2,7 @@
{{#each presenceUsers as |user|}} - {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}} + {{avatar user imageSize="small"}} {{/each}}
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs index 002a2d3189..33abf3510b 100644 --- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs +++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs @@ -2,7 +2,9 @@
{{#each users as |user|}} - {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}} + {{#user-link user=user}} + {{avatar user imageSize="small"}} + {{/user-link}} {{/each}}
From 0bf30196c92e8ef77995cb2b097bc1633960fbf1 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 30 Nov 2021 20:02:22 +0100 Subject: [PATCH 159/168] FIX: Broken css in #15141 (#15144) --- app/assets/stylesheets/mobile/compose.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss index 08171d7d20..afbf39cc09 100644 --- a/app/assets/stylesheets/mobile/compose.scss +++ b/app/assets/stylesheets/mobile/compose.scss @@ -11,7 +11,7 @@ .reply-area { padding: 6px; - padding-bottom: max(env(safe-area-inset-bottom), 6px); + padding-bottom: unquote("max(env(safe-area-inset-bottom), 6px)"); flex-grow: 1; } From 4ef11e786bd35c07c46bba28c1433c451b6b6886 Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Tue, 30 Nov 2021 16:31:11 -0300 Subject: [PATCH 160/168] DEV: Add aarch64 platform (#15143) --- Gemfile.lock | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 453c996af2..eb80bdea03 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -198,6 +198,7 @@ GEM jwt (2.3.0) kgio (2.11.4) libv8-node (16.10.0.0) + libv8-node (16.10.0.0-aarch64-linux) libv8-node (16.10.0.0-arm64-darwin) libv8-node (16.10.0.0-x86_64-darwin) libv8-node (16.10.0.0-x86_64-darwin-19) @@ -475,6 +476,7 @@ GEM zeitwerk (2.5.1) PLATFORMS + aarch64-linux arm64-darwin-20 ruby x86_64-darwin-18 From b12f89e351d2340a721a8ff01946930bf31a7cdd Mon Sep 17 00:00:00 2001 From: Discourse Translator Bot Date: Tue, 30 Nov 2021 15:06:39 -0500 Subject: [PATCH 161/168] Update translations (#15140) --- config/locales/client.ar.yml | 3 + config/locales/client.be.yml | 2 + config/locales/client.bg.yml | 3 + config/locales/client.bs_BA.yml | 3 + config/locales/client.ca.yml | 4 + config/locales/client.cs.yml | 3 + config/locales/client.da.yml | 3 + config/locales/client.de.yml | 8 + config/locales/client.el.yml | 3 + config/locales/client.es.yml | 17 + config/locales/client.et.yml | 3 + config/locales/client.fa_IR.yml | 3 + config/locales/client.fi.yml | 3 + config/locales/client.fr.yml | 3 + config/locales/client.gl.yml | 3 + config/locales/client.he.yml | 11 + config/locales/client.hu.yml | 15 + config/locales/client.hy.yml | 3 + config/locales/client.id.yml | 3 + config/locales/client.it.yml | 6 + config/locales/client.ja.yml | 3 + config/locales/client.ko.yml | 3 + config/locales/client.lt.yml | 5 + config/locales/client.lv.yml | 3 + config/locales/client.nb_NO.yml | 3 + config/locales/client.nl.yml | 3 + config/locales/client.pl_PL.yml | 5 + config/locales/client.pt.yml | 3 + config/locales/client.pt_BR.yml | 3 + config/locales/client.ro.yml | 3 + config/locales/client.ru.yml | 10 + config/locales/client.sk.yml | 3 + config/locales/client.sl.yml | 3 + config/locales/client.sq.yml | 3 + config/locales/client.sr.yml | 2 + config/locales/client.sv.yml | 6 + config/locales/client.sw.yml | 3 + config/locales/client.te.yml | 2 + config/locales/client.th.yml | 3 + config/locales/client.tr_TR.yml | 426 +++++------ config/locales/client.uk.yml | 3 + config/locales/client.ur.yml | 3 + config/locales/client.vi.yml | 3 + config/locales/client.zh_CN.yml | 3 + config/locales/client.zh_TW.yml | 3 + config/locales/server.ar.yml | 1 - config/locales/server.be.yml | 1 - config/locales/server.ca.yml | 1 - config/locales/server.da.yml | 1 - config/locales/server.de.yml | 44 +- config/locales/server.es.yml | 26 +- config/locales/server.fi.yml | 1 - config/locales/server.fr.yml | 1 - config/locales/server.gl.yml | 1 - config/locales/server.he.yml | 7 +- config/locales/server.hu.yml | 46 ++ config/locales/server.hy.yml | 1 - config/locales/server.it.yml | 30 +- config/locales/server.ja.yml | 1 - config/locales/server.ko.yml | 1 - config/locales/server.lt.yml | 2 + config/locales/server.nl.yml | 1 - config/locales/server.pl_PL.yml | 2 +- config/locales/server.pt_BR.yml | 1 - config/locales/server.ru.yml | 47 +- config/locales/server.sv.yml | 21 +- config/locales/server.tr_TR.yml | 706 +++++++++--------- config/locales/server.uk.yml | 1 - config/locales/server.ur.yml | 1 - config/locales/server.zh_CN.yml | 1 - config/locales/server.zh_TW.yml | 1 - plugins/poll/config/locales/server.es.yml | 1 + .../styleguide/config/locales/client.cs.yml | 59 ++ 73 files changed, 1013 insertions(+), 606 deletions(-) diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index 878a1b8467..32039770d0 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -3662,6 +3662,9 @@ ar: title: "هذا الموضوع عبارة عن رسالة خاصة" help: "هذا الموضوع عبارة عن رسالة خاصة" posts: "المنشورات" + pending_posts: + label: "قيد الانتظار" + label_with_count: "قيد الانتظار (%{count})" posts_likes_MF: | يتضمَّن هذا الموضوع {count, plural, zero {# رد} one {ردًا واحدًا (#)} two {ردَّين (#)} few {# ردود} many {# ردًا} other {# رد}} {ratio, select, low {بمعدل إعجابات مرتفع على المنشورات} diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml index d1eed7996d..c01ec2bb99 100644 --- a/config/locales/client.be.yml +++ b/config/locales/client.be.yml @@ -1206,6 +1206,8 @@ be: pinned: title: "замацаваныя" posts: "паведамленні" + pending_posts: + label: "чакаецца" original_post: "першы паведамленне" views: "прагляды" replies: "адказы" diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml index 78f1b1786e..f13060932b 100644 --- a/config/locales/client.bg.yml +++ b/config/locales/client.bg.yml @@ -2786,6 +2786,9 @@ bg: unlisted: help: "Тази тема е скрита; не се появява в списъка с теми и може да бъде достъпна само с директен линк." posts: "Публикации" + pending_posts: + label: "Чакащи" + label_with_count: "Чакащи (%{count})" original_post: "Оригинална публикация" views: "Прегледи" views_lowercase: diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index 09969ca97d..06eebd2cca 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -2729,6 +2729,9 @@ bs_BA: title: "Ova tema je lična poruka" help: "Ova tema je lična poruka" posts: "Odgovori" + pending_posts: + label: "Na čekanju" + label_with_count: "Na čekanju (%{count})" original_post: "Originalni Odgovor" views: "Pregledi" views_lowercase: diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml index 939ec08c85..eef0172405 100644 --- a/config/locales/client.ca.yml +++ b/config/locales/client.ca.yml @@ -41,6 +41,7 @@ ca: long_date_without_year_with_linebreak: "D MMM
HH:mm" long_date_with_year_with_linebreak: "D MMM 'YY
HH:mm" wrap_ago: "fa %{date} " + wrap_on: "el %{date}" tiny: half_a_minute: "< 1m" less_than_x_seconds: @@ -2572,6 +2573,9 @@ ca: title: "Aquest tema és un missatge personal" help: "Aquest tema és un missatge personal" posts: "Publicacions" + pending_posts: + label: "Pendent" + label_with_count: "Pendents (%{count})" original_post: "Publicació original" views: "Vistes" views_lowercase: diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 51fb7c9332..6084f2e53e 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -2535,6 +2535,9 @@ cs: unlisted: help: "Toto téma je neviditelné; nebude se zobrazovat v seznamu témat a lze ho navštívit pouze přes přímý odkaz" posts: "Příspěvků" + pending_posts: + label: "Čeká na schválení" + label_with_count: "Nevyřízeno (%{count})" original_post: "Původní příspěvek" views: "Zobrazení" views_lowercase: diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index ff4c3be905..aec3716e2f 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -3095,6 +3095,9 @@ da: title: "Dette emne er en privat besked" help: "Dette emne er en privat besked" posts: "Indlæg" + pending_posts: + label: "Afventende" + label_with_count: "Ventende (%{count})" posts_likes_MF: | Dette emne har {count, plural, one {# svar} other {# svar}} {ratio, select, low {med et højt forhold i mellem antal 'Synes godt om' og antal indlæg} diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 5c56c338ab..dee9e45462 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -1913,6 +1913,9 @@ de: cannot_see_mention: category: "Du hast %{username} erwähnt, aber diese Person wird nicht benachrichtigt, da sie keinen Zugriff auf diese Kategorie hat. Füge sie einer Gruppe hinzu, die Zugriff auf diese Kategorie hat." private: "Du hast %{username} erwähnt, aber diese Person wird nicht benachrichtigt, da sie diese persönliche Nachricht nicht sehen kann. Lade sie zu dieser persönlichen Nachricht ein." + here_mention: + one: "Indem du @%{here}erwähnst, bist du dabei, %{count} Benutzer zu benachrichtigen - bist du sicher?" + other: "Indem du @%{here}erwähnst, benachrichtigst du %{count} Benutzer - bist du sicher?" duplicate_link: "Es sieht so aus, als ob dein Link zu %{domain} bereits im Thema von @%{username} in einer Antwort vor %{ago} geteilt wurde – bist du sicher, dass du ihn noch einmal teilen möchtest?" reference_topic_title: "AW: %{title}" error: @@ -2173,6 +2176,8 @@ de: in_topics_posts: "in allen Themen und Beiträgen" enter_hint: "oder drücke die Eingabetaste" in_posts_by: "in Beiträgen von %{username}" + browser_tip: "%{modifier} + f" + browser_tip_description: "nochmal um die native Browsersuche zu verwenden" type: default: "Themen/Beiträge" users: "Benutzer" @@ -3217,6 +3222,9 @@ de: title: "Dieses Thema ist eine persönliche Nachricht" help: "Dieses Thema ist eine persönliche Nachricht" posts: "Beiträge" + pending_posts: + label: "Ausstehend" + label_with_count: "Ausstehend (%{count})" posts_likes_MF: | Dieses Thema hat {count, plural, one {# Antwort} other {# Antworten}} {ratio, select, low {mit einem hohen Verhältnis von „Gefällt mir“ zu Beiträgen} diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml index ad5b11d1d9..f171d82100 100644 --- a/config/locales/client.el.yml +++ b/config/locales/client.el.yml @@ -2742,6 +2742,9 @@ el: title: "Αυτό το θέμα είναι ένα προσωπικό μήνυμα" help: "Αυτό το θέμα είναι ένα προσωπικό μήνυμα" posts: "Αναρτήσεις" + pending_posts: + label: "Εκκρεμή" + label_with_count: "Εκρεμείς (%{count})" original_post: "Αρχική Ανάρτηση" views: "Προβολές" views_lowercase: diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index f3bc77e218..609e7bc559 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -1143,6 +1143,7 @@ es: tags: "Etiquetas" warnings: "Advertencias oficiales" read_more_in_group: "¿Quieres leer más? Consulta otros mensajes de %{groupLink}." + read_more: "¿Quieres leer más? Busca otros mensajes en tus mensajes personales." preferences_nav: account: "Cuenta" security: "Seguridad" @@ -1481,11 +1482,14 @@ es: expired_at_time: "Caducada en %{time}" show_advanced: "Mostrar opciones avanzadas" hide_advanced: "Ocultar opciones avanzadas" + restrict_email: "Restringir al correo electrónico" max_redemptions_allowed: "Máximo de usos" add_to_groups: "Añadir a grupos" + invite_to_topic: "Llegar al tema" expires_at: "Caducar tras" custom_message: "Mensaje personal opcional" send_invite_email: "Guardar y enviar correo electrónico" + send_invite_email_instructions: "Restringir la invitación al correo electrónico para enviar un correo electrónico de invitación" save_invite: "Guardar invitación" invite_saved: "Invitación guardada." bulk_invite: @@ -2164,6 +2168,10 @@ es: in_topics_posts: "en todos los temas y publicaciones" enter_hint: "o pulsa Intro" in_posts_by: "en publicaciones por %{username}" + browser_tip: "%{modifier} + f" + browser_tip_description: "otra vez para usar la búsqueda nativa de tu navegador" + recent: "Búsquedas recientes" + clear_recent: "Borrar búsquedas recientes" type: default: "Temas/respuestas" users: "Usuarios" @@ -2580,6 +2588,9 @@ es: help: "comparte el enlace a este tema" instructions: "Comparte el enlace a este tema:" copied: "Enlace al tema copiado." + restricted_groups: + one: "Sólo visible para los miembros del grupo: %{groupNames}" + other: "Sólo visible para los miembros de los grupos: %{groupNames}" notify_users: title: "Notificar" instructions: "Notificar sobre este tema a los siguientes usuarios:" @@ -3205,6 +3216,9 @@ es: title: "Este tema es un mensaje personal" help: "Este tema es un mensaje personal" posts: "Publicaciones" + pending_posts: + label: "Pendiente" + label_with_count: "Pendientes (%{count})" posts_likes_MF: | Este tema tiene {count, plural, one {# respuesta} other {# respuestas}} {ratio, select, low {con una proporción de me gusta por publicación alta} @@ -3408,6 +3422,7 @@ es: title: "Menú de búsqueda" prev_next: "%{shortcut} Mover selección arriba y abajo" insert_url: "%{shortcut} Insertar selección dentro del editor abierto" + full_page_search: "%{shortcut} Lanza la página de búsqueda" badges: earned_n_times: one: "Insignia ganada %{count} vez" @@ -3848,6 +3863,8 @@ es: wordpress: Necesario para que el plugin para WordPress wp-discourse funcione. posts: edit: Edita cualquier publicación o una específica. + uploads: + create: Sube un nuevo archivo. users: bookmarks: Listar marcadores de usuario. Devuelve recordatorios de marcadores cuando se utiliza el formato ICS. sync_sso: Sincroniza un usuario usando DiscourseConnect. diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml index 2aa14aaf9f..f27b2e7480 100644 --- a/config/locales/client.et.yml +++ b/config/locales/client.et.yml @@ -2296,6 +2296,9 @@ et: unlisted: help: "See teema on salastatud; teda ei kuvata teemade loendites ning on kättesaadav vaid otseviite kaudu" posts: "Postitused" + pending_posts: + label: "Ootel" + label_with_count: "Ootel (%{count})" original_post: "Algne postitus" views: "Vaatamisi" views_lowercase: diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index aa81ea9e16..9e0df0212c 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -2738,6 +2738,9 @@ fa_IR: title: "این تاپیک یک پیام‌خصوصی است" help: "این تاپیک یک پیام‌خصوصی است" posts: "نوشته‌ها" + pending_posts: + label: "در انتظار" + label_with_count: "(%{count}) در انتظار" original_post: "نوشته اصلی" views: "نمایش‌ها" views_lowercase: diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index a04bba611f..fa4928b9af 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -3117,6 +3117,9 @@ fi: title: "Tämä ketju on yksityisviesti" help: "Tämä ketju on yksityisviesti" posts: "Viestejä" + pending_posts: + label: "Odottaa" + label_with_count: "Avoimet (%{count})" posts_likes_MF: | Tässä ketjussa on {count, plural, one {1 vastaus} other {# vastausta}}{ratio, select, low {, joilla on suuri määrä tykkäyksiä suhteessa viestien määrään} diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index d036981005..5da39f0b29 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -3114,6 +3114,9 @@ fr: title: "Ce sujet est un message direct" help: "Ce sujet est un message direct" posts: "Messages" + pending_posts: + label: "En attente" + label_with_count: "En attente (%{count})" posts_likes_MF: | Ce sujet comprend {count, plural, one {# réponse} other {# réponses}} {ratio, select, low {avec un taux élevé de « J'aime » par message} diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml index 7a927f5a07..196a87de83 100644 --- a/config/locales/client.gl.yml +++ b/config/locales/client.gl.yml @@ -3020,6 +3020,9 @@ gl: title: "Este tema é unha mensaxe privada" help: "Este tema é unha mensaxe privada" posts: "Publicacións" + pending_posts: + label: "Pendente" + label_with_count: "Pendentes (%{count})" posts_likes_MF: | Este tema ten {count, plural, one {# resposta} other {# respostas}} {ratio, select, low {cun alto nivel de valoración da publicación} diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 6ecfbd8b60..bf3f82054b 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -1042,6 +1042,7 @@ he: all: "הכל" read: "נקרא" unread: "לא-נקראו" + unseen: "לא נראו" ignore_duration_title: "התעלמות ממשתמש" ignore_duration_username: "שם משתמש" ignore_duration_when: "משך:" @@ -2053,6 +2054,11 @@ he: cannot_see_mention: category: "הזכרת את %{username} אבל לא תישלח אליו/ה התרעה עקב העדר גישה לקטגוריה זו. יהיה עליך להוסיף אותו/ה לקבוצה שיש לה גישה לקטגוריה הזו." private: "הזכרתם את %{username} אבל הוא/היא לא יקבלו התראה כיוון שהם לא יכולים לראות את ההודעה הפרטית הזו. תצטרכו להזמין אותם להודעה פרטית זו." + here_mention: + one: "אזכור של ‎@%{here} יודיע למשתמש %{count}, להמשיך?" + two: "אזכור של ‎@%{here} יודיע ל־%{count} משתמשים, להמשיך?" + many: "אזכור של ‎@%{here} יודיע ל־%{count} משתמשים, להמשיך?" + other: "אזכור של ‎@%{here} יודיע ל־%{count} משתמשים, להמשיך?" duplicate_link: "נראה שהקישור שלך אל %{domain} כבר פורסם בנושא הזה על ידי ‎@%{username}‎ כתגובה ב%{ago} - לפרסם אותו שוב?" reference_topic_title: "תגובה: %{title}" error: @@ -2336,6 +2342,8 @@ he: in_posts_by: "בפוסטים מאת %{username}" browser_tip: "‎%{modifier} + f" browser_tip_description: "שוב כדי להשתמש בחיפוש המקורי של הדפדפן" + recent: "חיפושים אחרונים" + clear_recent: "ניקוי חיפושים אחרונים" type: default: "נושאים/פוסטים" users: "משתמשים" @@ -3460,6 +3468,9 @@ he: title: "הנושא הזה הוא הודעה אישית" help: "הנושא הזה הוא הודעה אישית" posts: "פוסטים" + pending_posts: + label: "בהמתנה" + label_with_count: "ממתינות (%{count})" posts_likes_MF: | לנושא זה יש {count, plural, one {תגובה אחת} two {שתי תגובות} many {# תגובות} other {# תגובות}} {ratio, select, low {עם יחס גבוה של לייקים לפוסט} diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml index 9c9262b203..f21b205b86 100644 --- a/config/locales/client.hu.yml +++ b/config/locales/client.hu.yml @@ -1896,6 +1896,9 @@ hu: cannot_see_mention: category: "Megemlítette %{username} felhasználót, de nem lesz értesítve, mivel nincs hozzáférése ehhez a témához. Hozzá kell adnia egy olyan csoporthoz, amely hozzáfér ehhez a kategóriához." private: "Említetted %{username} de nem lesznek értesítve mivel képtelenek megnézni ezt a személyes üzenetet. Megkell hívnod őket ehez a személyes üzenethez" + here_mention: + one: "A(z) @%{here} megemlítésével %{count} felhasználót fog értesíteni – biztos benne?" + other: "A(z) @%{here} megemlítésével %{count} felhasználót fog értesíteni – biztos benne?" duplicate_link: "Úgy tűnik, hogy a %{domain} re mutató linkjét @%{username} már ban közzétette a témában, válasz: %{ago} - Biztosan újra el akarja küldeni?" reference_topic_title: "Válasz: %{title}" error: @@ -2065,6 +2068,9 @@ hu: reaction_2: "%{username}, %{username2} %{description}" votes_released: "%{description} – kész" dismiss_confirmation: + body: + one: "Biztos benne? %{count} fontos értesítése van." + other: "Biztos benne? %{count} fontos értesítése van." dismiss: "Elvetés" cancel: "Mégse" group_message_summary: @@ -2149,6 +2155,10 @@ hu: in_topics_posts: "az összes témában és bejegyzésben" enter_hint: "vagy nyomjon Entert" in_posts_by: "%{username} bejegyzéseiben" + browser_tip: "%{modifier} + f" + browser_tip_description: "újra a böngésző natív keresőjének használata" + recent: "Legutóbbi keresések" + clear_recent: "Legutóbbi keresések törlése" type: default: "Témák/bejegyzések" users: "Felhasználók" @@ -2904,6 +2914,9 @@ hu: unlisted: help: "Ez egy nem listázandó témakör, ezért nem fog megjelenni a témakörök listájában és csak közvetlen hivatkozással érhető el." posts: "Bejegyzések:" + pending_posts: + label: "Függőben" + label_with_count: "Függőben (%{count})" original_post: "Eredeti Bejegyzés" views: "Megtekintések" views_lowercase: @@ -3324,6 +3337,8 @@ hu: resource: Forrás action: Művelet descriptions: + uploads: + create: Töltsön fel egy új fájlt. users: update: Felhasználói profil adatainak frissítése. web_hooks: diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml index 29d0ec7c3a..222b161d9c 100644 --- a/config/locales/client.hy.yml +++ b/config/locales/client.hy.yml @@ -2566,6 +2566,9 @@ hy: title: "Այս թեման անձնական հաղորդագրություն է" help: "Այս թեման անձնական հաղորդագրություն է" posts: "Գրառումներ" + pending_posts: + label: "Սպասող" + label_with_count: "Սպասող (%{count})" original_post: "Սկզբնական Գրառումը" views: "Դիտում" views_lowercase: diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index b0b02a4c70..0fdb167215 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -1634,6 +1634,9 @@ id: locked_and_archived: help: "Topik ini telah ditutup dan diarsip; tidak lagi menerima jawaban baru dan tidak dapat dirubah lagi" posts: "Pos" + pending_posts: + label: "Tertunda" + label_with_count: "Tertunda (%{count})" replies: "Balasan" activity: "Aktifitas" likes: "Suka" diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 54752cc0de..37260bfc03 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -1898,6 +1898,9 @@ it: cannot_see_mention: category: "Hai menzionato %{username} ma non riceverà notifiche perché non ha accesso a questa categoria. Dovrai aggiungerlo ad un gruppo che ha accesso a questa categoria." private: "Hai menzionato %{username} ma non riceverà notifiche perché non ha accesso a questo messaggio personale. Dovrai invitarlo a questo MP." + here_mention: + one: "Menzionando @%{here}, verrà inviata una notifica a %{count} utente – confermi?" + other: "Menzionando @%{here}, verrà inviata una notifica a %{count} utenti – confermi?" duplicate_link: "Sembra che il tuo collegamento a %{domain} sia già stato pubblicato in questo argomento da @%{username} in una risposta di %{ago} - sei sicuro di volerlo pubblicare ancora?" reference_topic_title: "RE: %{title}" error: @@ -3176,6 +3179,9 @@ it: title: "Questo argomento è un messaggio personale" help: "Questo argomento è un messaggio personale" posts: "Messaggi" + pending_posts: + label: "In attesa" + label_with_count: "In sospeso (%{count})" posts_likes_MF: | Questo argomento ha {count, plural, one {# risposta} other {# risposte}} {ratio, select, low {con un'alta percentuale di 'mi piace' sulle risposte} diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 3003230e5f..ef4ee0b3f6 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -2989,6 +2989,9 @@ ja: title: "このトピックは個人メッセージです" help: "このトピックは個人メッセージです" posts: "投稿" + pending_posts: + label: "保留中" + label_with_count: "保留中 (%{count})" posts_likes_MF: | このトピックには{ratio, select, low {「いいね！」率が高い} diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index f2f5ce4f58..275676f81f 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -3061,6 +3061,9 @@ ko: title: "이 주제는 개인 메시지입니다" help: "이 주제는 개인 메시지입니다" posts: "글" + pending_posts: + label: "보류중" + label_with_count: "보류중 (%{count})" original_post: "원본 글" views: "조회수" views_lowercase: diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml index 27f3514572..c275698cc6 100644 --- a/config/locales/client.lt.yml +++ b/config/locales/client.lt.yml @@ -2018,6 +2018,8 @@ lt: enter_hint: "arba paspauskite Enter" in_posts_by: "pranešimuose %{username}" browser_tip: "%{modifier} + f" + recent: "Naujausios paieškos" + clear_recent: "Išvalyti naujausias paieškas" type: default: "Temos/įrašai" users: "Nariai" @@ -2985,6 +2987,9 @@ lt: title: "Ši tema yra asmeninė žinutė" help: "Ši tema yra asmeninė žinutė" posts: "Įrašai" + pending_posts: + label: "Laukiama" + label_with_count: "Neperskaityti (%{count})" original_post: "Originalus įrašas" views: "Peržiūros" views_lowercase: diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml index 92489ad715..49bb3b5699 100644 --- a/config/locales/client.lv.yml +++ b/config/locales/client.lv.yml @@ -2569,6 +2569,9 @@ lv: unlisted: help: "Šī tēma nav iekļauta sarakstos; tā netiks attēlota tēmu sarakstos, un piekļūt tai varēs, tikai izmantojot tiešu saiti" posts: "Ieraksti" + pending_posts: + label: "Gaidošie" + label_with_count: "Gaidošie (%{count})" original_post: "Oriģinālais ieraksts" views: "Skatījumi" views_lowercase: diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 8c0a819de9..b8b0b22da4 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -3069,6 +3069,9 @@ nb_NO: title: "Dette emnet er en personlig melding" help: "Dette emnet er en personlig melding" posts: "Innlegg" + pending_posts: + label: "På vent" + label_with_count: "Ventende (%{count})" posts_likes_MF: | Dette emnet har {count, plural, one {1 svar} other {# svar}} {ratio, select, low {med mange likes i forhold til innlegg} diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 4806fd5909..4679086dcb 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -3108,6 +3108,9 @@ nl: title: "Dit topic is een persoonlijk bericht" help: "Dit topic is een persoonlijk bericht" posts: "Berichten" + pending_posts: + label: "In wachtrij" + label_with_count: "Uitstaand (%{count})" posts_likes_MF: | Dit topic heeft {count, plural, one {# antwoord} other {# antwoorden}} {ratio, select, low {met een hoge verhouding likes per bericht} diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 36b6e341b1..59734067e9 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -2340,6 +2340,8 @@ pl_PL: in_topics_posts: "we wszystkich tematach i postach" enter_hint: "lub naciśnij Enter" in_posts_by: "w postach %{username}" + recent: "Ostatnie wyszukiwania" + clear_recent: "Wyczyść ostatnie wyszukiwania" type: default: "Tematy/posty" users: "Użytkownicy" @@ -3475,6 +3477,9 @@ pl_PL: title: "Ten temat jest wiadomością prywatną" help: "Ten temat jest wiadomością prywatną" posts: "Wpisy" + pending_posts: + label: "Oczekujące" + label_with_count: "Oczekujące (%{count})" posts_likes_MF: | Ten temat ma {count, plural, one {# odpowiedź} few {# odpowiedzi} many {# odpowiedzi} other {# odpowiedzi}} {ratio, select, low {z wysokim stosunkiem polubień na post} diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 4980f174de..01e76b7cd5 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -3053,6 +3053,9 @@ pt: title: "Este tópico é uma mensagem pessoal" help: "Este tópico é uma mensagem pessoal" posts: "Publicações" + pending_posts: + label: "Pendente" + label_with_count: "Pendentes (%{count})" original_post: "Publicação Original" views: "Vistas" views_lowercase: diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index db9f6b5479..65c9a2ff0c 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -3142,6 +3142,9 @@ pt_BR: title: "Este tópico é uma mensagem pessoal" help: "Este tópico é uma mensagem pessoal" posts: "Postagens" + pending_posts: + label: "Pendentes" + label_with_count: "Pendentes (%{count})" posts_likes_MF: | Este tópico tem {count, plural, one {# resposta} other {# respostas}} {ratio, select, low {com uma alta taxa de postagns para curtidas} diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index 5567559527..2a97a99b4b 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -2488,6 +2488,9 @@ ro: unlisted: help: "Acest subiect este invizibil; nu va fi afișat în listele de subiecte și va putea fi accesat numai prin link direct" posts: "Postări" + pending_posts: + label: "În așteptare" + label_with_count: "În așteptare: (%{count})" original_post: "Postare inițială" views: "Vizualizări" views_lowercase: diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index f911b3db1a..83e961b90e 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -2065,6 +2065,11 @@ ru: cannot_see_mention: category: "Вы упомянули %{username}, но они не будут уведомлены, потому что у них нет доступа к этому разделу. Вам нужно добавить их в группу, имеющую доступ к этому разделу." private: "Вы упомянули %{username}, но они не будут уведомлены, потому что они не могут видеть это личное сообщение. Вам нужно пригласить их в это ЛС." + here_mention: + one: "Упоминая @%{here}, вы собираетесь уведомить %{count} пользователя - вы уверены?" + few: "Упоминая @%{here}, вы собираетесь уведомить %{count} пользователей - вы уверены?" + many: "Упоминая @%{here}, вы собираетесь уведомить %{count} пользователей - вы уверены?" + other: "Упоминая @%{here}, вы собираетесь уведомить %{count} пользователей - вы уверены?" duplicate_link: "Кажется, ваша ссылка на %{domain} уже была ранее размещена пользователем @%{username} в этом ответе %{ago}. Вы точно хотите разместить её ещё раз?" reference_topic_title: "RE: %{title}" error: @@ -2353,6 +2358,8 @@ ru: in_posts_by: "В сообщениях от %{username}" browser_tip: "%{modifier} + f" browser_tip_description: "Использовать поисковый движок браузера" + recent: "Недавние запросы" + clear_recent: "Очистить недавние запросы" type: default: "По темам и сообщениям" users: "По пользователям" @@ -3493,6 +3500,9 @@ ru: title: "Эта тема преобразована в личные сообщения" help: "Эта тема преобразована в личные сообщения" posts: "Сообщ." + pending_posts: + label: "Ожидают одобрения" + label_with_count: "Ожидающие (%{count})" posts_likes_MF: | В этой теме {count, plural, one {# сообщение} few {# сообщения} other {# сообщений}} {ratio, select, low {с высоким рейтингом симпатий} diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml index 71dbd14d39..8c680c1f76 100644 --- a/config/locales/client.sk.yml +++ b/config/locales/client.sk.yml @@ -2028,6 +2028,9 @@ sk: unlisted: help: "Táto téma je skrytá. Nebude zobrazená v zozname tém a prístup k nej bude možný len prostrednictvom priameho odkazu na ňu" posts: "Príspevky" + pending_posts: + label: "Čakajúce správy" + label_with_count: "Čakajúce (%{count})" original_post: "Pôvodný príspevok" views: "Zobrazenia" views_lowercase: diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml index b639c23777..dc82f3d4ec 100644 --- a/config/locales/client.sl.yml +++ b/config/locales/client.sl.yml @@ -3008,6 +3008,9 @@ sl: title: "Ta tema je zasebno sporočilo" help: "Ta tema je zasebno sporočilo" posts: "Prispevki" + pending_posts: + label: "Za potrditev" + label_with_count: "V teku (%{count})" original_post: "Izvirni prispevek" views: "Ogledi" views_lowercase: diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 0925318e22..0a7f3ac87a 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -1698,6 +1698,9 @@ sq: unlisted: help: "Kjo temë nuk është e listuar, pra nuk do të paraqitet nue listat e temave të faqes dhe mund të shikohet vetëm me lidhje direkte" posts: "Postime" + pending_posts: + label: "Në pritje" + label_with_count: "Në pritje (%{count})" original_post: "Postimi Origjinal" views: "Shikimet" views_lowercase: diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml index 73da9a39d3..90d47727d8 100644 --- a/config/locales/client.sr.yml +++ b/config/locales/client.sr.yml @@ -1604,6 +1604,8 @@ sr: unlisted: help: "Ova tema je ne-listovana; neće se prikazivati na listi tema i može joj se pristupiti samo preko direktnog linka." posts: "Poruke" + pending_posts: + label: "U toku" original_post: "Originalna Poruka" views: "Pregledi" replies: "Odgovori" diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 392d89517e..80df55cc26 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -1913,6 +1913,9 @@ sv: cannot_see_mention: category: "Du nämnde %{username}, men hen kommer inte att få någon avisering för hen har inte tillgång till denna kategori. Du måste lägga till hen till en grupp som har tillgång till den här kategorin." private: "Du nämnde %{username}, men hen kommer inte få någon avisering eftersom hen inte kan se detta personliga meddelande. Du måste bjuda in hen till detta PM." + here_mention: + one: "Genom att nämna @%{here}kommer du att meddela %{count} användare – är du säker?" + other: "Genom att nämna @%{here}kommer du att meddela %{count} användare – är du säker?" duplicate_link: "Det verkar som din länk till %{domain} redan har lagts in i ämnet av @%{username} i ett svar den %{ago} – är du säker på att du vill lägga upp den igen?" reference_topic_title: "SV: %{title}" error: @@ -3219,6 +3222,9 @@ sv: title: "Detta ämne är ett personligt meddelande" help: "Detta ämne är ett personligt meddelande" posts: "Inlägg" + pending_posts: + label: "Väntar" + label_with_count: "Pågående (%{count})" posts_likes_MF: | Detta ämne har {count, plural, one {# svar} other {# svar}} {ratio, select, low {med ett högt förhållande mellan gillningar/inlägg} diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml index f2bb6ba08a..322bcc7725 100644 --- a/config/locales/client.sw.yml +++ b/config/locales/client.sw.yml @@ -2031,6 +2031,9 @@ sw: unlisted: help: "Mada hii imeondolewa kwenye orodha. Haitaonyeshwa kwenye orodha za mada, na njia pekee ya kuifia ni kupitia kiungo chake" posts: "Machapisho" + pending_posts: + label: "subiria" + label_with_count: "(%{count}) zinasubiria" original_post: "Chapisho la Kwanza" views: "Imeonwa" views_lowercase: diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml index 3f8a85a492..f2f0a85f55 100644 --- a/config/locales/client.te.yml +++ b/config/locales/client.te.yml @@ -1198,6 +1198,8 @@ te: unlisted: help: "ఈ విషయం జాబితాలనుండి తొలగించబడింది. ఇహ కేవలం నేరు లంకె ద్వారా మాత్రమే చూడగలరు." posts: "టపాలు" + pending_posts: + label: "పెండింగు" original_post: "మూల టపా" views: "చూపులు" replies: "జవాబులు" diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml index 6bd01f0e5e..e86c270e86 100644 --- a/config/locales/client.th.yml +++ b/config/locales/client.th.yml @@ -2174,6 +2174,9 @@ th: title: "กระทู้นี้เป็นข้อความส่วนตัว" help: "กระทู้นี้เป็นข้อความส่วนตัว" posts: "โพสต์" + pending_posts: + label: "อยู่ระหว่างการพิจารณา" + label_with_count: "กำลังรอ (%{count})" original_post: "โพสต์ต้นฉบับ" views: "ดู" views_lowercase: diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 982fea2af0..daf981f8df 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -212,9 +212,9 @@ tr_TR: admin_title: "Yönetici" show_more: "daha fazla göster" show_help: "seçenekler" - links: "Bağlantılar" + links: "Bağlantı" links_lowercase: - one: "bağlantılar" + one: "bağlantı" other: "bağlantılar" faq: "SSS" guidelines: "Öneriler" @@ -283,6 +283,7 @@ tr_TR: bookmarks: created: "%{name} Başlıklı gönderiye yer işareti koydunuz." not_bookmarked: "bu yazıya yer işareti koy" + remove_reminder_keep_bookmark: "Anımsatıcıyı kaldır ve yer imini tut" created_with_reminder: "%{name} Bu gönderiye %{date} hatırlatıcısı ile yer işareti koydunuz." remove: "İşareti Kaldır" delete: "İşareti Sil" @@ -297,7 +298,7 @@ tr_TR: label: "Otomatik olarak sil" never: "Asla" when_reminder_sent: "Hatırlatıcı gönderildikten sonra" - on_owner_reply: "Bu konuya cevap verdikten sonra" + on_owner_reply: "Bu konuyu yanıtladıktan sonra" search_placeholder: "Yer imlerini isme, konu başlığına veya gönderi içeriğine göre arayın" search: "Arama" reminders: @@ -315,20 +316,20 @@ tr_TR: remove_confirmation: "Bu taslağı silmek istediğinizden emin misiniz?" new_topic: "Yeni konu taslağı" new_private_message: "Yeni kişisel mesaj taslağı" - topic_reply: "Cevap taslağı" + topic_reply: "Yanıt taslağı" abandon: confirm: "Bu konu için devam eden bir taslağınız var. Bununla ne yapmak istersiniz?" yes_value: "At" no_value: "Düzenlemeye devam et" topic_count_categories: - one: "%{count} yeni ya da güncellenmiş konu." - other: "%{count} yeni ya da güncellenmiş konu." + one: "%{count} yeni veya güncellenmiş konu" + other: "%{count} yeni veya güncellenmiş konu" topic_count_latest: - one: "%{count} yeni ya da güncellenmiş konu." - other: "%{count} yeni ya da güncellenmiş konu." + one: "%{count} yeni veya güncellenmiş konu" + other: "%{count} yeni veya güncellenmiş konu" topic_count_unseen: - one: "%{count} yeni ya da güncellenmiş konu." - other: "%{count} yeni ya da güncellenmiş konu." + one: "%{count} yeni veya güncellenmiş konu" + other: "%{count} yeni veya güncellenmiş konu" topic_count_unread: one: "%{count} Okunmamış konuyu görün" other: "%{count} Okunmamış konuları görün" @@ -374,7 +375,7 @@ tr_TR: review: order_by: "Sırala" date_filter: "Şu tarihler arasında yayınlandı" - in_reply_to: "cevap olarak" + in_reply_to: "yanıt olarak" explain: why: "bu makalenin neden sıraya girdiğini açıkla" title: "Gözden geçirilebilir Puanlama" @@ -390,7 +391,7 @@ tr_TR: name: "kullanıcı doğruluğu" title: "Bayrakları tarihsel olarak kararlaştırılmış olanlara bonus verilir." trust_level_bonus: - name: "güven seviyesi" + name: "güven düzeyi" title: "Güven düzeyi yüksek kullanıcılar tarafından oluşturulan, incelenebilir öğeler daha yüksek bir puana sahiptir." type_bonus: name: "tür bonusu" @@ -434,7 +435,7 @@ tr_TR: website: "İnternet sitesi" username: "Kullanıcı Adı" email: "Eposta" - name: "İsim" + name: "Ad" fields: "Alanlar" reject_reason: "Sebep" user_percentage: @@ -490,7 +491,7 @@ tr_TR: conversation: view_full: "sohbetin hepsini görüntüle" scores: - about: "Bu skor rapor eden kişinin güven seviyesine, başarımlarının doğruluğuna ve raporlanan maddenin önceliğine göre hesaplanır." + about: "Bu skor rapor eden kişinin güven düzeyine, başarımlarının doğruluğuna ve raporlanan maddenin önceliğine göre hesaplanır." score: "Skor" date: "Tarih" type: "Tür" @@ -569,19 +570,19 @@ tr_TR: none: "Hiçbiri" last_custom: "En son belirlenen özel tarih/saat" user_action: - user_posted_topic: "%{user} konuyu açtı" - you_posted_topic: "konuyu sen açtın" - user_replied_to_post: "%{user} %{post_number} gönderiyi cevapladı" - you_replied_to_post: "%{post_number} gönderiyi sen cevapladın" - user_replied_to_topic: "%{user} konuya cevap verdi" - you_replied_to_topic: "Sen konuya cevap verdin" - user_mentioned_user: "%{user} %{another_user} adlı kullanıcıdan bahsetti" - user_mentioned_you: "%{user} sizden bahsetti" - you_mentioned_user: "Sen, %{another_user} adlı kullanıcıdan bahsettin" + user_posted_topic: "%{user}, konusunu açtı" + you_posted_topic: "Bu konu sizin tarafınızdan açıldı" + user_replied_to_post: "%{user}, %{post_number} gönderisini yanıtladı" + you_replied_to_post: "%{post_number} gönderisini yanıtladın" + user_replied_to_topic: "%{user}, konusunu yanıtladı" + you_replied_to_topic: "Konuyu yanıtladın" + user_mentioned_user: "%{user}, %{another_user} adlı kullanıcıdan bahsetti" + user_mentioned_you: "%{user}, sizden bahsetti" + you_mentioned_user: "Siz, %{another_user} adlı kullanıcıdan bahsettiniz" posted_by_user: "%{user} tarafından gönderildi" - posted_by_you: "Senin tarafından gönderildi" + posted_by_you: "Siz gönderdiniz" sent_by_user: "%{user} tarafından gönderildi" - sent_by_you: "Senin tarafından gönderildi" + sent_by_you: "Siz gönderdiniz" directory: username: "Kullanıcı Adı" filter_name: "kullanıcı adına göre filtrele" @@ -593,8 +594,8 @@ tr_TR: time_read: "Okuma Zamanı" topic_count: "Konular" topic_count_long: "Oluşturulan Konular" - post_count: "Cevaplar" - post_count_long: "Gönderilen Cevaplar" + post_count: "Yanıtlar" + post_count_long: "Gönderilen Yanıtlar" no_results: "Hiçbir sonuç bulunamadı." days_visited: "Ziyaretler" days_visited_long: "Ziyaret edilen günler" @@ -638,11 +639,11 @@ tr_TR: handle: "üyelik isteğini yerine getir" manage: title: "Yönet" - name: "İsim" - full_name: "Tam İsim" + name: "Ad" + full_name: "Ad-Soyad" add_members: "Kullanıcı ekle" invite_members: "Davet et" - delete_member_confirm: "'%{username}' adlı kullanıcıyı '%{group}' grubundan çıkart?" + delete_member_confirm: "'%{username}' adlı kullanıcı '%{group}' grubundan çıkarılsın mı?" profile: title: Profil interaction: @@ -686,7 +687,7 @@ tr_TR: settings: title: "Ayarlar" allow_unknown_sender_topic_replies: "Bilinmeyen gönderen konu yanıtlarına izin ver." - allow_unknown_sender_topic_replies_hint: "Bilinmeyen gönderenlerin grup konularına cevap vermesine izin verir. Bu ayar etkinleştirilmezse, konuya davet edilmemiş e-posta adreslerinden gelen yanıtlar yeni bir konu oluşturacaktır." + allow_unknown_sender_topic_replies_hint: "Bilinmeyen gönderenlerin grup konularını yanıtlamasına izin verir. Bu ayar etkinleştirilmezse konuya davet edilmemiş e-posta adreslerinden gelen yanıtlar yeni bir konu oluşturacaktır." mailboxes: synchronized: "Senkronize Posta Kutusu" none_found: "Bu e-posta hesabında hiçbir posta kutusu bulunamadı." @@ -710,7 +711,7 @@ tr_TR: watched_tags_instructions: "Bu etikette tüm konuları otomatik olarak izleyin. Grup üyelerine tüm yeni gönderiler ve konular bildirilecek ve konunun yanında yeni gönder görünecektir." tracked_tags_instructions: "Bu etiketlerle tüm konuları otomatik olarak izleyin. Konunun yanında bir dizi yeni gönderi görünecektir." watching_first_post_tags_instructions: "Kullanıcılara her yeni konudaki ilk gönderi bu etiketlerle bildirilecektir." - regular_tags_instructions: "Bu etiketlerin sesi kapatılırsa, grup üyeleri için sesi açılacaktır. Kullanıcılar, kendilerinden bahsedilirse veya birileri onlara cevap verirse bilgilendirilecektir." + regular_tags_instructions: "Bu etiketlerin sesi kapatılırsa grup üyeleri için sesi açılacaktır. Kullanıcılar, kendilerinden bahsedilirse veya birileri onları yanıtlarsa bilgilendirilecektir." muted_tags_instructions: "Kullanıcılar bu kategorilerdeki yeni konular hakkında hiçbir şey bildirilmez ve kategorilerde veya en son konu sayfalarında görünmezler." logs: title: "Kayıtlar" @@ -749,7 +750,7 @@ tr_TR: title: "@%{group_name} için katılım talebi" reason: "Grup sahiplerine bu gruba neden üye olduğunu bildir" membership: "Üyelik" - name: "İsim" + name: "Ad" group_name: "Grup adı" user_count: "Kullanıcılar" bio: "Grup Hakkında" @@ -808,7 +809,7 @@ tr_TR: posts: "Gönderiler" mentions: "Bahsedilenler" messages: "Mesajlar" - notification_level: "Grup mesajları için varsayılan bildirim seviyesi" + notification_level: "Grup mesajları için varsayılan bildirim düzeyi" alias_levels: mentionable: "Bu gruptan kimler @bahsedebilir?" messageable: "Bu gruba kimler mesaj gönderebilir?" @@ -821,16 +822,16 @@ tr_TR: notifications: watching: title: "İzleniyor" - description: "Her mesajda her yeni gönderi hakkında bilgilendirileceksin ve yeni cevap sayısı gösterilecek." + description: "Her mesajda her yeni gönderi hakkında bilgilendirileceksin ve yeni yanıt sayısı gösterilecek." watching_first_post: title: "İlk Gönderi İzlenmesi" - description: "Cevaplar dışında, bu gruptaki yeni mesajlar için bilgilendirileceksiniz." + description: "Yanıtlar dışında, bu gruptaki yeni mesajlar için bilgilendirileceksiniz." tracking: title: "Takip ediliyor" - description: "Herhangi biri @isminden bahseder ya da sana cevap verirse bildirim alacaksın ve yeni cevap sayısını göreceksin." + description: "Herhangi birisi @adınızdan bahseder veya sizi yanıtlarsa bildirim alacaksınız ve yeni yanıt sayısını göreceksiniz." regular: title: "Normal" - description: "Herhangi biri @isminden bahseder ya da sana cevap verirse bildirim alacaksın" + description: "Herhangi birisi @adınızdan bahseder veya sizi yanıtlarsa bildirim alacaksınız." muted: title: "Sessiz" description: "Bu gruptaki bütün mesajlarla ilgili bilgilendirileceksiniz." @@ -855,7 +856,7 @@ tr_TR: "2": "Alınan Beğeniler" "3": "İşaretlenenler" "4": "Konular" - "5": "Cevaplar" + "5": "Yanıtlar" "6": "Yanıtlar" "7": "Bahsedilenler" "9": "Alıntılar" @@ -948,7 +949,7 @@ tr_TR: ignore_duration_time_frame_required: "Bir zaman dilimi seç" ignore_no_users: "Yoksaydığınız kullanıcı bulunmuyor." ignore_option: "Yok sayıldı" - ignore_option_title: "Bu kullanıcıyla ilgili bildirimleri almayacaksınız ve kullanıcının tüm başlık ve cevapları gizlenecek." + ignore_option_title: "Bu kullanıcıyla ilgili bildirimleri almayacaksınız ve kullanıcının tüm başlık ve yanıtları gizlenecek." add_ignored_user: "Ekle..." mute_option: "Sessiz" mute_option_title: "Bir daha bu kullanıcıyla ilgili bildirim almayacaksın." @@ -990,7 +991,7 @@ tr_TR: bio: "Hakkımda" timezone: "Saat dilimi" invited_by: "Tarafından Davet Edildi" - trust_level: "Güven Seviyesi" + trust_level: "Güven Düzeyi" notifications: "Bildirimler" statistics: "İstatistikler" desktop_notifications: @@ -1002,7 +1003,7 @@ tr_TR: disable: "Bildirimleri Devre Dışı Bırak" enable: "Bildirimleri Etkinleştir" each_browser_note: 'Not: Kullandığınız her tarayıcıda bu ayarı değiştirmeniz gerekir. Bu ayardan bağımsız olarak, "rahatsız etmeyin" modundayken tüm bildirimler devre dışı bırakılır.' - consent_prompt: "Gönderilerine cevap verildiğinde anlık bildirim almak ister misin?" + consent_prompt: "Gönderileriniz yanıtlandığında anlık bildirim almak ister misiniz?" dismiss: "Kapat" dismiss_notifications: "Tümünü Kapat" dismiss_notifications_tooltip: "Tüm okunmamış bildirileri okunmuş olarak işaretle" @@ -1015,8 +1016,10 @@ tr_TR: no_bookmarks_search: "Bu arama koşullarıyla bir yer işareti bulunamadı." no_notifications_title: "Henüz herhangi bir bildiriminiz yok" no_notifications_body: > - Konu ve iletilerinize verilen yanıtlar da dahil olmak üzere, doğrudan sizle alâkalı etkinlik olduğunda, biri size @mention attığında veya sizi alıntıladığında bu panelde bildirilecektir. Bir süredir giriş yapmadığınızda da bildirimler e-posta olarak gönderilecektir.

Hangi konular, kategoriler ve etiketler hakkında bilgilendirilmek istediğinize karar vermek için %{icon} ikonuna bakın. Daha fazlası için bildirim tercihlerinize bakın. + Konu ve iletilerinize verilen yanıtlar da dahil olmak üzere, doğrudan sizle alâkalı etkinlik olduğunda, birisi @adınızı belirttiğinde veya sizi alıntıladığında bu panelde bildirilecektir. Bir süredir giriş yapmadığınızda da bildirimler e-posta olarak gönderilecektir.

Hangi konular, kategoriler ve etiketler hakkında bilgilendirilmek istediğinize karar vermek için %{icon} simgesine bakın. Daha fazlası için bildirim tercihlerinize bakın. no_notifications_page_title: "Henüz herhangi bir bildiriminiz yok" + no_notifications_page_body: > + Konu ve iletilerinize verilen yanıtlar da dahil olmak üzere, doğrudan sizle ilgili etkinlik olduğunda, biri size @mention attığında veya sizi alıntıladığında bu panelde bildirilecektir. Bir süredir giriş yapmadığınızda da bildirimler e-posta olarak gönderilecektir.

Hangi konular, kategoriler ve etiketler hakkında bilgilendirilmek istediğinize karar vermek için %{icon} ikonuna bakın. Daha fazlası için bildirim tercihlerinize bakın. first_notification: "İlk bildirimin! Başlamak için seç." dynamic_favicon: "Sayacı, tarayıcı ikonu üzerinde göster" skip_new_user_tips: @@ -1189,7 +1192,7 @@ tr_TR: disable_all: "Tümünü devre dışı bırak" forgot_password: "Parolanızı mı unuttunuz?" confirm_password_description: "Devam etmek için lütfen parolanızı onaylayın" - name: "İsim" + name: "Ad" label: "Kod" rate_limit: "Yeni bir doğrulama kodu girmeden önce lütfen bekleyin." enable_description: | @@ -1301,16 +1304,16 @@ tr_TR: not_connected: "(bağlı değil)" confirm_modal_title: "Bağlan%{provider} Hesap" confirm_description: - disconnect: "Mevcut %{provider} hesabınızın '%{account_description}' bağlantısı kesilecek." - account_specific: "Sizin %{provider} hesabınız '%{account_description}' doğrulama için kullanılacak." + disconnect: "Mevcut %{provider} '%{account_description}' hesabınızın bağlantısı kesilecek." + account_specific: "Sizin %{provider} '%{account_description}' hesabınız doğrulama için kullanılacak." generic: "Sizin %{provider} hesabınız doğrulama için kullanılacak." name: - title: "İsim" + title: "Ad" instructions: "tam adın (opsiyonel)" instructions_required: "Tam adın" - required: "Lütfen bir isim girin" - too_short: "İsmin çok kısa" - ok: "İsmin iyi görünüyor" + required: "Lütfen bir ad girin" + too_short: "Adınız çok kısa" + ok: "Adınız iyi görünüyor" username: title: "Kullanıcı adı" instructions: "Benzersiz, boşluksuz, kısa" @@ -1376,7 +1379,7 @@ tr_TR: first_time: "Gönderi ilk kez beğenildiğinde" never: "Asla" email_previous_replies: - title: "Önceki cevapları e-postaların sonuna ekle" + title: "Önceki yanıtları e-postaların sonuna ekle" unless_emailed: "daha önce gönderilmedi ise" always: "her zaman" never: "asla" @@ -1395,7 +1398,7 @@ tr_TR: never: "asla" email_messages_level: "Herhangi biri bana mesaj yazdığında bana e-posta gönder" include_tl0_in_digests: "Yeni kullanıcılardan gelen içeriği özet e-postalarına ekle" - email_in_reply_to: "Gönderilere gelen cevapların bir örneğini e-postaya ekle" + email_in_reply_to: "Gönderilerinize gelen yanıtların bir örneğini e-postaya ekle" other_settings: "Diğer" categories_settings: "Kategoriler" new_topic_duration: @@ -1535,9 +1538,9 @@ tr_TR: bookmark_count: one: "imler" other: "işaretliler" - top_replies: "En çok cevaplananlar" - no_replies: "Henüz cevaplanmamış" - more_replies: "Daha fazla cevap" + top_replies: "En çok yanıtlananlar" + no_replies: "Henüz yanıtlanmamış" + more_replies: "Daha fazla yanıt" top_topics: "En çok konuşulan konular" no_topics: "Henüz konu bulunmuyor." more_topics: "Daha fazla konu" @@ -1548,11 +1551,11 @@ tr_TR: no_links: "Henüz bir bağlantı bulunmuyor." most_liked_by: "En Çok Beğenen" most_liked_users: "En Çok Beğenilen" - most_replied_to_users: "En Çok Cevaplanan" + most_replied_to_users: "En Çok Yanıtlanan" no_likes: "Henüz beğeni bulunmuyor." top_categories: "En Çok Konuşulan Kategoriler" topics: "Konular" - replies: "Cevaplar" + replies: "Yanıtlar" ip_address: title: "Son IP Adresi" registration_ip_address: @@ -1633,10 +1636,10 @@ tr_TR: time_read_recently: "%{time_read} son günlerde" time_read_tooltip: "%{time_read} toplam okuma zamanı" time_read_recently_tooltip: "%{time_read} toplam okuma zamanı (%{recent_time_read} son 60 gün içerisinde)" - last_reply_lowercase: son cevap + last_reply_lowercase: son yanıt replies_lowercase: - one: cevap - other: cevaplar + one: yanıt + other: yanıtlar signup_cta: sign_up: "Kayıt Ol" hide_session: "Yarın bana hatırlat" @@ -1647,8 +1650,8 @@ tr_TR: summary: enabled_description: "Bu konunun özetini görüntülüyorsun: Okuyucularımızın en çok ilgisini çeken gönderiler" description: - one: "%{count} adet cevap var." - other: "%{count} adet cevap var." + one: "%{count} yanıt var." + other: "%{count} yanıt var." description_time_MF: "Tahmini okuma süresi {readingTime, plural, one {# dakika} other {# dakika}} olan {replyCount, plural, one {# yanıt} other {# yanıt}} var." enable: "Bu Konuyu Özetle" disable: "Tüm Gönderileri Göster" @@ -1665,19 +1668,19 @@ tr_TR: remove: "Kaldır..." add: "Ekle..." leave_message: "Gerçekten bu mesajdan çıkmak mı istiyorsun?" - remove_allowed_user: "Bu mesajdan %{name} isimli kullanıcıyı çıkarmak istediğine emin misin?" - remove_allowed_group: "Gerçekten %{name} isimli kullanıcıyı bu mesajdan kaldırmak istiyor musun?" + remove_allowed_user: "Bu mesajdan %{name} adlı kullanıcıyı çıkarmak istediğine emin misiniz?" + remove_allowed_group: "Gerçekten %{name} adlı kullanıcıyı bu mesajdan kaldırmak istiyor musunuz?" email: "E-posta" username: "Kullanıcı Adı" last_seen: "Görülen" created: "Oluşturuldu" created_lowercase: "oluşturuldu" - trust_level: "Güven Seviyesi" + trust_level: "Güven Düzeyi" search_hint: "kullanıcı adı, e-posta veya IP adresi" create_account: header_title: "Hoşgeldiniz!" subheader_title: "Haydi, hesabınızı oluşturalım" - disclaimer: "Kayıt olarak Gizlilik İlkeleri'ni ve Hizmet Şartları'nı kabul etmiş olursunuz." + disclaimer: "Kayıt olarak Gizlilik İlkeleri'ni ve Hizmet Şartları'nı kabul etmiş olursunuz." title: "Yeni Hesap Oluştur" failed: "Bir şeyler ters gitti. Bu e-posta ile daha önce bir kayıt oluşturulmuş olabilir. \"Parolamı unuttum\" bağlantısına tıklayarak ilerlemeni öneririz." associate: "Zaten bir hesabınız var mı? %{provider} hesabınızı bağlamak için giriş yapın." @@ -1791,7 +1794,7 @@ tr_TR: your_email: "Hesap e-posta adresin %{email}." accept_invite: "Daveti kabul et" success: "Hesabın oluşturuldu ve şimdi giriş yaptın." - name_label: "İsim" + name_label: "Ad" password_label: "Parola" optional_description: "(isteğe bağlı)" password_reset: @@ -1891,21 +1894,21 @@ tr_TR: add_warning: "Bu resmi bir uyarıdır." toggle_whisper: "Fısıldamayı Aç/Kapa" toggle_unlisted: "Listelenmemiş değişiklik" - posting_not_on_topic: "Hangi konuyu cevaplamak istiyorsun?" + posting_not_on_topic: "Hangi konuyu yanıtlamak istiyorsunuz?" saved_local_draft_tip: "yerel olarak kaydedildi" similar_topics: "Konun şunlara benziyor..." drafts_offline: "çevrimdışı taslaklar" edit_conflict: "çakışmayı düzenle" group_mentioned_limit: - one: "Uyarı! %{group} bahsettiniz, ancak bu grubun yönetici tarafından yapılandırılan %{count} kullanıcılı ifade sınırından daha fazla üyesi var. Kimseye haber verilmeyecek." + one: "Uyarı! %{group} grubundan bahsettiniz; ancak bu grubun yönetici tarafından yapılandırılan %{count} kullanıcılı ifade sınırından daha fazla üyesi var. Kimseye haber verilmeyecek." other: "Uyarı! Bahsettiğiniz %{group} bu grubun yöneticisi tarafından yapılandırılmış %{count} kullanıcı sınırından daha fazla üyesi vardır. Kimseye haber verilmeyecek." group_mentioned: - one: "%{group} hakkında konuşarak %{count} kişiyi bilgilendirmek üzeresin, emin misin?" + one: "%{group} hakkında konuşarak %{count} kişiyi bilgilendirmek üzeresiniz; bundan emin misiniz?" other: "%{group} hakkında konuşarak %{count} kişiyi bilgilendirmek üzeresin, emin misin?" cannot_see_mention: category: "%{username} adlı kullanıcıdan bahsettin fakat bildirim gönderilmeyecek çünkü kullanıcının bu kategoriye ulaşma izni yok. Kullanıcının bildirimi görebilmesi için onu bu gruba eklemen gerekiyor." private: "%{username} adlı kullanıcıdan bahsettin fakat bildirim gönderilmeyecek çünkü kullanıcının bu kişisel mesaja ulaşma izni yok. Kişisel mesaja ulaşabilmesi için kullanıcıyı PM'ye eklemen gerekiyor." - duplicate_link: "Görünüşe göre %{domain} alan adına bağlanan bağlantınız @%{username} tarafından konu içine gönderdiği cevapta %{ago} yayınlanmış görünüyor. Tekrar yayınlamak istediğinize emin misiniz?" + duplicate_link: "Görünüşe göre %{domain} alan adına bağlanan bağlantınız @%{username} tarafından konu içine gönderdiği yanıtta %{ago} yayınlanmış görünüyor. Tekrar yayınlamak istediğinize emin misiniz?" reference_topic_title: "RE: %{title}" error: title_missing: "Başlık gerekli" @@ -1927,9 +1930,9 @@ tr_TR: topic_template_not_modified: "Lütfen konu şablonunu düzenleyerek daha fazla ayrıntı ekleyin." save_edit: "Değişikliği Kaydet" overwrite_edit: "Üzerine Yaz" - reply_original: "Asıl konu üzerinden cevap ver" - reply_here: "Buradan Cevapla" - reply: "Cevapla" + reply_original: "Asıl konu üzerinden yanıtla" + reply_here: "Buradan Yanıtla" + reply: "Yanıtla" cancel: "İptal et" create_topic: "Konu Oluştur" create_pm: "Mesaj" @@ -1999,7 +2002,7 @@ tr_TR: edit: Düzenle reply_to_post: label: Bir gönderiyi %{postUsername} ile yanıtla - desc: İlgili gönderiyi cevapla + desc: İlgili gönderiyi yanıtla reply_as_new_topic: label: Bağlantılı konu olarak yanıtla desc: Bu konuyla bağlantılı yeni bir konu oluştur @@ -2023,7 +2026,7 @@ tr_TR: desc: "Yalnızca izin verilen kullanıcılar tarafından görülebilecek bir konu taslağı oluşturun" toggle_topic_bump: label: "Konu detaylarını değiştir" - desc: "Son cevap tarihini değiştirmeden yanıtla" + desc: "Son yanıt tarihini değiştirmeden yanıtla" reload: "Yeniden Yükle" ignore: "Yoksay" notifications: @@ -2037,7 +2040,7 @@ tr_TR: high_priority: one: "%{count} okunmamış yüksek öncelikli bildirim" other: "%{count} okunmamış yüksek öncelikli bildirim" - title: "@isime yapılan bildirimler, gönderilerin ve konularına verilen cevaplar, mesajlarla vb. ilgili bildiriler" + title: "@ada yapılan bildirimler, gönderilerin ve konularına verilen yanıtlar, mesajlarla vb. ilgili bildiriler" none: "Şu an için bildirimler yüklenemiyor." empty: "Bildirim yok." post_approved: "Gönderiniz onaylandı" @@ -2064,7 +2067,7 @@ tr_TR: invitee_accepted: "%{username} davetinizi kabul etti" moved_post: "%{username} %{description} taşıdı" linked: "%{username} %{description}" - granted_badge: "'%{description}' kazandı" + granted_badge: "'%{description}' kazanıldı" topic_reminder: "%{username} %{description}" watching_first_post: "Yeni Konu %{description}" membership_request_accepted: "'%{group_name}' üyeliği kabul edildi" @@ -2084,7 +2087,7 @@ tr_TR: mentioned: '%{username}, "%{topic}" başlıklı konuda sizden bahsetti - %{site_title}' group_mentioned: '%{username} sizden bahsetti "%{topic}" - %{site_title}' quoted: '%{username}, "%{topic}" başlıklı konuda sizden alıntı yaptı - %{site_title}' - replied: '%{username}, "%{topic}" başlıklı konuda size cevap verdi - %{site_title}' + replied: '%{username}, "%{topic}" başlıklı konuda sizi yanıtladı - %{site_title}' posted: '%{username}, "%{topic}" başlıklı konuya yazdı - %{site_title}' private_message: '%{username} "%{topic} konusunda "size kişisel bir mesaj gönderdi - %{site_title}' linked: '%{username}, "%{topic}" başlıklı konudaki gönderinize bağlantı yaptı - %{site_title}' @@ -2094,7 +2097,7 @@ tr_TR: custom: "%{username} tarafından bildirim %{site_title}" titles: mentioned: "adı geçen" - replied: "yeni cevap" + replied: "yeni yanıt" quoted: "alıntı" edited: "düzenlendi" liked: "yeni beğeni" @@ -2215,7 +2218,7 @@ tr_TR: closed: kapalı public: halka açık archived: arşivlenmiş - noreplies: sıfır cevabı olan + noreplies: yanıtsız olan single_user: tek kullanıcı içeren post: count: @@ -2307,7 +2310,7 @@ tr_TR: top: "Popüler bir konu yok." educate: new: '

Yeni konularınız burada görünecektir. Varsayılan olarak, konular yeni kabul edilir ve son 2 gün içinde oluşturulmuşlarsa göstergesi gösterilir.

Bunu değiştirmek için tercihinizi ziyaret edin.

' - unread: '

Okunmamış konuların burada görünecek.

Konular varsayılan olarak okunmamış sayılır ve aşağıdaki durumlarda okunmamış mesaj sayısı 1 gösterilir:

  • Konuyu sen oluşturmuşsan
  • Konuya cevap vermişsen
  • Konuyu 4 dakikadan fazla okumuşsan

Veya, konuyu her konunun altında bulunan bildirim kontrol alanından Gözleniyor veya Takip Ediliyor olarak seçmişsen.

Tercihler sayfandan bunu değiştirebilirsin.

' + unread: '

Okunmamış konularınız burada görünecek.

Konular varsayılan olarak okunmamış sayılır ve aşağıdaki durumlarda okunmamış mesaj sayısı 1 gösterilir:

  • Konuyu siz oluşturmuşsanız
  • Konuyu yanıtlamışsanız
  • Konuyu 4 dakikadan fazla okumuşsanız

Veya konuyu her konunun altında bulunan bildirim kontrol alanından Gözleniyor veya Takip Ediliyor olarak seçmişseniz.

Tercihler sayfanızdan bunu değiştirebilirsiniz.

' bottom: latest: "Daha fazla güncel konu yok." posted: "Daha fazla gönderilmiş konu yok." @@ -2379,13 +2382,13 @@ tr_TR: browse_all_tags: Tüm etiketlere göz atın view_latest_topics: Son konuları görüntüle suggest_create_topic: Yeni bir sohbet başlatmak için hazır mısın? - jump_reply_up: Önceki cevaba geç - jump_reply_down: Sonraki cevaba geç + jump_reply_up: Önceki yanıta geç + jump_reply_down: Sonraki yanıta geç deleted: "Konu silindi" slow_mode_update: title: "Yavaş mod" select: "Kullanıcılar bu konuda yalnızca bir kez gönderi yapabilir:" - description: "Hızlı cevaplanan veya ateşi yüksek tartışmalarda, mantıklı ve kaliteli cevaplar verilmesi amacıyla kullanıcıların bu konuya tekrar cevap yazabilmesi için beklemesi gerekir." + description: "Hızlı yanıtlanan veya ateşi yüksek tartışmalarda, mantıklı ve kaliteli cevaplar verilmesi amacıyla kullanıcıların bu konuya yeniden yanıt yazabilmesi için beklemesi gerekir." enable: "Etkinleştir" update: "Güncelle" enabled_until: "Şu zamana kadar etkinleştirildi:" @@ -2464,11 +2467,11 @@ tr_TR: auto_open: "Bu konu %{timeLeft} otomatik olarak açılacak." auto_close: "Bu konu %{timeLeft} otomatik olarak kapanacak." auto_publish_to_category: "Bu konu %{timeLeft} #%{categoryName} kategorisinde yayınlanacak." - auto_close_after_last_post: "Bu konu son cevaptan %{duration} sonra kapanacak." + auto_close_after_last_post: "Bu konu son yanıttan %{duration} sonra kapanacak." auto_delete: "Bu konu otomatik olarak silinecek %{timeLeft}." auto_bump: "Bu konu otomatik olarak patlayacak%{timeLeft}." auto_reminder: "%{timeLeft} Bu konu hakkında hatırlatılacaksınız" - auto_delete_replies: "Bu konudaki cevaplar yazıldıktan %{duration} sonra otomatik olarak silinir." + auto_delete_replies: "Bu konudaki yanıtlar yazıldıktan %{duration} sonra otomatik olarak silinir." auto_close_title: "Otomatik Kapatma Ayarları" auto_close_immediate: one: "Konudaki son gönderi zaten %{count} saat eski, bu yüzden konu hemen kapatılacak." @@ -2499,7 +2502,7 @@ tr_TR: notifications: title: bu konu hakkında bildirim sıklığını değiştir reasons: - mailing_list_mode: "Duyuru listesi modunu etkinleştirdin. Bu sebeple bu konuya gelen cevaplarla ilgili bildirimleri e-posta yoluyla alacaksın." + mailing_list_mode: "Duyuru listesi modunu etkinleştirdiniz. Bu sebeple bu konuya gelen yanıtlarla ilgili bildirimleri e-posta yoluyla alacaksınız." "3_10": "Bu konuyla ilgili bir etiketi izlediğin için bildirimleri alacaksın." "3_10_stale": "Geçmişte bu konuyla ilgili bir etiketi izlediğiniz için bildirimler alacaksınız." "3_6": "Bu kategoriyi izlediğin için bildirimleri alacaksın." @@ -2508,34 +2511,34 @@ tr_TR: "3_2": "Bu konuyu izlediğin için bildirimleri alacaksın." "3_1": "Bu konuyu sen oluşturduğun için bildirimleri alacaksın." "3": "Bu konuyu izlediğin için bildirimleri alacaksın." - "2_8": "Bu kategoriyi takip ettiğiniz için yeni cevapların sayısını göreceksiniz." + "2_8": "Bu kategoriyi takip ettiğiniz için yeni yanıtların sayısını göreceksiniz." "2_8_stale": "Geçmişte bu kategoriyi izlediğiniz için bir dizi yeni yanıt göreceksiniz." - "2_4": "Bu konuyu yanıtladığınız için yeni cevapların sayısını göreceksiniz." - "2_2": "Bu konuyu takip ettiğiniz için yeni cevapların sayısını göreceksiniz." - "2": 'Bu konuyu okuduğunuz için yeni cevapların sayısını göreceksiniz.' - "1_2": "Birisi @isminden bahsederse ya da sana cevap verirse bildirim alacaksın." - "1": "Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın." + "2_4": "Bu konuyu yanıtladığınız için yeni yanıtların sayısını göreceksiniz." + "2_2": "Bu konuyu takip ettiğiniz için yeni yanıtların sayısını göreceksiniz." + "2": 'Bu konuyu okuduğunuz için yeni yanıtların sayısını göreceksiniz.' + "1_2": "Birisi @adınızdan bahsederse veya sizi yanıtlarsa bildirim alacaksınız." + "1": "Birisi @adınızdan bahsederse veya sizi yanıtlarsa bildirim alacaksınız." "0_7": "Bu kategoriye ait tüm bildirimleri yok sayıyorsun." "0_2": "Bu konuya ait tüm bildirimleri yok sayıyorsun." "0": "Bu konuya ait tüm bildirimleri yok sayıyorsun." watching_pm: title: "İzleniyor" - description: "Bu mesajdaki her yeni gönderi için bir bildirim alacaksın ve yeni cevap sayısı gösterilecek." + description: "Bu mesajdaki her yeni gönderi için bir bildirim alacaksınız ve yeni yanıt sayısı gösterilecek." watching: title: "İzleniyor" - description: "Bu konudaki her yeni gönderi için bildirim alacaksın ve yeni cevap sayısı gösterilecek." + description: "Bu konudaki her yeni gönderi için bildirim alacaksınız ve yeni yanıt sayısı gösterilecek." tracking_pm: title: "Takip Ediliyor" - description: "Bu mesaj için yeni cevapların sayısı gösterilecek. Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın." + description: "Bu mesaj için yeni yanıtların sayısı gösterilecek. Birisi @adınızdan bahsederse veya sizi yanıtlarsa bildirim alacaksınız." tracking: title: "Takip Ediliyor" - description: "Bu konu için yeni cevap sayısı gösterilecek. Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın." + description: "Bu konu için yeni yanıt sayısı gösterilecek. Birisi @adınızdan bahsederse veya sizi yanıtlarsa bildirim alacaksınız." regular: title: "Normal" - description: "Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın." + description: "Birisi @adınızdan bahsederse veya sizi yanıtlarsa bildirim alacaksınız." regular_pm: title: "Normal" - description: "Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın." + description: "Birisi @adınızdan bahsederse veya sizi yanıtlarsa bildirim alacaksınız." muted_pm: title: "Sessiz" description: "Bu mesaj ile ilgili hiçbir bildirim almayacaksın." @@ -2568,8 +2571,8 @@ tr_TR: make_banner: "Manşet Konusu Yap" remove_banner: "Pankart Konusunu Kaldır" reply: - title: "Cevapla" - help: "bu konuya bir cevap oluşturmaya başla" + title: "Yanıtla" + help: "bu konuya bir yanıt oluşturmaya başla" share: title: "Paylaş" extended_title: "Bağlantı paylaş" @@ -2641,15 +2644,15 @@ tr_TR: to_forum: "Arkadaşına, içindeki bağlantıya tıklayarak katılabilmesi için bir e-posta göndereceğiz." discourse_connect_enabled: "Bu konuya davet etmek istediğin kişinin kullanıcı adını gir." to_topic_blank: "Bu konuya davet etmek istediğin kişinin kullanıcı adını veya e-posta adresini gir." - to_topic_email: "Bir e-posta adresi girdin. Arkadaşının bu konuya hemen cevap verebilmesini sağlayacak bir davetiyeyi e-posta ile göndereceğiz." + to_topic_email: "Bir e-posta adresi girdiniz. Arkadaşınızın bu konuyu hemen yanıtlayabilmesini sağlayacak bir davetiyeyi e-posta ile göndereceğiz." to_topic_username: "Bir kullanıcı adı girdin. Kullanıcıya, bu konuya davet bağlantısı içeren bir bildirim göndereceğiz." to_username: "Davet etmek istediğin kişinin kullanıcı adını gir. Kullanıcıya, bu konuya davet bağlantısı içeren bir bildirim göndereceğiz." - email_placeholder: "isim@örnek.com" + email_placeholder: "ad@örnek.com" success_email: "%{invitee} kullanıcısına davet e-postalandı. Davet kabul edildiğinde sana bir bildirim göndereceğiz. Davetlerini takip etmek için kullanıcı sayfandaki davetler sekmesine göz atmalısın." success_username: "Kullanıcıyı bu konuya katılması için davet ettik." error: "Üzgünüz, kullanıcıyı davet edemedik. Zaten davet edilmiş olabilir mi? (Davetler oran sınırlarına tabiidir.)" success_existing_email: "%{emailOrUsername} e-posta adresine sahip bir kullanıcı zaten var. Bu kullanıcıyı bu konuya katılmaya davet ettik." - login_reply: "Cevaplamak için giriş yap" + login_reply: "Yanıtlamak için giriş yap" filters: n_posts: one: "%{count} gönderi" @@ -2738,8 +2741,8 @@ tr_TR: label: "seçilmiş" title: "Seçimi yayından kaldırmak için tıkla" select_replies: - label: "seçim +cevaplar" - title: "Gönderiyi ve tüm cevaplarını seçime ekle" + label: "+yanıtları seç" + title: "Gönderiyi ve tüm yanıtları seçime ekle" select_below: label: "seç +alt" title: "Seçimin ardından gönderi ekle" @@ -2762,8 +2765,8 @@ tr_TR: ignored: "Yoksayılan içerik" wiki_last_edited_on: "wiki en son %{dateTime} tarihinde düzenlendi" last_edited_on: "gönderi en son %{dateTime} tarihinde düzenlendi" - reply_as_new_topic: "Bağlantılı Konu Olarak Cevapla" - reply_as_new_private_message: "Aynı alıcıyı yeni bir mesajla cevapla" + reply_as_new_topic: "Bağlantılı Konu Olarak Yanıtla" + reply_as_new_private_message: "Aynı alıcıyı yeni bir mesajla yanıtla" continue_discussion: "%{postLink} Gönderisinden tartışılmaya devam ediliyor:" follow_quote: "alıntılanan gönderiye git" show_full: "Gönderinin Tamamını Göster" @@ -2780,8 +2783,8 @@ tr_TR: returning_user: "%{user} i göreli bir süre oldu — son gönderileri %{time} önce" unread: "Gönderi okunmamış" has_replies: - one: "%{count} Cevap" - other: "%{count} Cevap" + one: "%{count} Yanıt" + other: "%{count} Yanıt" has_replies_count: "%{count}" unknown_user: "(bilinmeyen/silinmiş kullanıcı)" has_likes_title: @@ -2824,7 +2827,7 @@ tr_TR: about: "bu gönderi bir wiki'dir" few_likes_left: "Beğendiğin için teşekkürler! Bugün için sadece birkaç beğenin kaldı." controls: - reply: "bu gönderiye bir cevap oluşturmaya başla" + reply: "bu gönderiye bir yanıt oluşturmaya başla" like: "bu gönderiyi beğen" has_liked: "bu gönderiyi beğendin" read_indicator: "bu yayını okuyan üyeler" @@ -2840,8 +2843,8 @@ tr_TR: delete_replies: confirm: "Bu gönderideki yanıtları da silmek istiyor musun?" direct_replies: - one: "Evet, ve %{count} doğrudan cevap" - other: "Evet ve %{count} doğrudan yanıtlar" + one: "Evet ve %{count} doğrudan yanıt" + other: "Evet ve %{count} doğrudan yanıt" all_replies: one: "Evet, ve %{count} yanıt" other: "Evet, ve tüm %{count} yanıtlar" @@ -2917,13 +2920,13 @@ tr_TR: comparing_previous_to_current_out_of_total: "%{previous}%{icon}%{current}/%{total}" displays: inline: - title: "Hazırlanan cevabı ekleme ve çıkarmalarla birlikte göster" + title: "Hazırlanan yanıtı ekleme ve çıkarmalarla birlikte göster" button: "HTML" side_by_side: - title: "Hazırlanan cevabın farklarını yan yana göster" + title: "Hazırlanan yanıtın farklarını yan yana göster" button: "HTML" side_by_side_markdown: - title: "Hazırlanan cevabın ham kaynaklarını yan yana göster" + title: "Hazırlanan yanıtın ham kaynaklarını yan yana göster" button: "Ham" raw_email: displays: @@ -2943,7 +2946,7 @@ tr_TR: edit_for_topic: "Konu için yer imi düzenle" created: "Oluşturuldu" updated: "Güncellenmiş" - name: "İsim" + name: "Ad" name_placeholder: "Bu yer imi ne için?" set_reminder: "Bana hatırlat" options: "Seçenekler" @@ -2995,7 +2998,7 @@ tr_TR: create_long: "Yeni bir kategori oluştur" save: "Kategoriyi Kaydet" slug: "Alakasız Kategoriler" - slug_placeholder: "(İsteğe bağlı) bağlantı için çizgi ile ayrılmış kelimeler" + slug_placeholder: "(İsteğe bağlı) bağlantı için çizgi ile ayrılmış sözcükler" creation_error: Kategori oluşturulurken bir hata oldu save_error: Kategori kaydedilirken hata oluştu. name: "Kategori Adı" @@ -3005,7 +3008,7 @@ tr_TR: badge_colors: "Rozet renkleri" background_color: "Arka plan rengi" foreground_color: "Ön plan rengi" - name_placeholder: "En fazla bir ya da iki kelime" + name_placeholder: "En fazla bir veya iki sözcük" color_placeholder: "Herhangi bir web rengi" delete_confirm: "Bu kategoriyi silmek istediğine emin misin?" delete_error: "Kategori silinirken bir hata oluştu." @@ -3018,7 +3021,7 @@ tr_TR: permissions: group: "Grup" see: "Bak" - reply: "Cevapla" + reply: "Yanıtla" create: "Oluştur" no_groups_selected: "Hiçbir gruba erişim izni verilmedi; bu kategori yalnızca personel tarafından görülebilir." everyone_has_access: 'Bu kategori herkese açıktır, herkes görebilir, yanıtlayabilir ve gönderiler oluşturabilir. İzinleri kısıtlamak için "herkes" grubuna verilen izinlerden birini veya birkaçını kaldırın.' @@ -3031,7 +3034,7 @@ tr_TR: pending_permission_change_alert: "Bu %{group} henüz kategoriye eklenmedi; eklemek için bu butona tıklayın." images: "Resimler" email_in: "Kişiselleşmiş gelen e-posta adresi:" - email_in_allow_strangers: "Hesabı olmayan, isimsiz kullanıcılardan e-posta kabul et" + email_in_allow_strangers: "Hesabı olmayan, adsız kullanıcılardan e-posta kabul et" email_in_disabled: "E-posta üzerinden yeni konu oluşturma özelliği Site Ayarları'nda devre dışı bırakılmış. E-posta üzerinden yeni konu oluşturma özelliğini etkinleştirmek için, " email_in_disabled_click: '"e-posta" ayarını etkinleştir' mailinglist_mirror: "Kategori bir e-posta listesini yansıtır" @@ -3051,7 +3054,7 @@ tr_TR: reviewable_by_group: "Personele ek olarak, bu kategorideki içerik şu kişiler tarafından da incelenebilir:" review_group_name: "grup adı" require_topic_approval: "Tüm yeni konular moderatör onayını gerektirir" - require_reply_approval: "Tüm yeni cevaplar moderatör onayı gerektirir" + require_reply_approval: "Tüm yeni yanıtlar moderatör onayı gerektirir" this_year: "bu yıl" position: "Kategoriler sayfasındaki pozisyon:" default_position: "Varsayılan Pozisyon" @@ -3063,19 +3066,19 @@ tr_TR: num_auto_bump_daily: "Günlük otomatik olarak açılan açık konuların sayısı:" navigate_to_first_post_after_read: "Konular okunduktan sonra ilk gönderiye dön" notifications: - title: "bu kategori için bildirim seviyesini değiştir" + title: "bu kategori için bildirim düzeyini değiştir" watching: title: "İzleniyor" description: "Bu kategorideki tüm konuları otomatik olarak izleyeceksiniz. Her konudaki her yeni gönderi size bildirilecek ve bir dizi yeni yanıt gösterilecektir." watching_first_post: title: "İlk Gönderi İzleme" - description: "Bu kategorideki yeni konular size bildirilecektir ancak konulara cevap verilmeyecektir." + description: "Bu kategorideki yeni konular size bildirilecektir; ancak konulara olan yanıtlar dışarıda bırakılacaktır." tracking: title: "Takip Ediliyor" - description: "Bu kategorideki tüm konuları otomatik olarak takip edeceksin. Birisi @isminden bahsederse veya gönderine cevap verirse bildirim alacak, ayrıca yeni cevapların sayısını da göreceksin." + description: "Bu kategorideki tüm konuları otomatik olarak takip edeceksiniz. Birisi @adınızdan bahsederse veya gönderinizi yanıtlarsa bildirim alacak, ayrıca yeni yanıtların sayısını da göreceksiniz." regular: title: "Normal" - description: "Birisi @isminden bahsederse veya sana cevap verirse bildirim alacaksın." + description: "Birisi @adınızdan bahsederse veya sizi yanıtlarsa bildirim alacaksınız." muted: title: "Sessiz" description: "Bu kategorideki konular hakkında herhangi bir bildiri almayacaksın ve bu konular en son yayınlananlar listesinde belirmeyecek." @@ -3092,7 +3095,7 @@ tr_TR: default: "varsayılan" likes: "Beğeniler" op_likes: "Orijinal Gönderi Beğenileri" - views: "Görüntülenenler" + views: "Görüntüleme" posts: "Gönderiler" activity: "Aktivite" posters: "Posterler" @@ -3179,11 +3182,11 @@ tr_TR: bookmarked: help: "Bu konuyu işaretledin" locked: - help: "Bu konu kapatıldığı için artık yeni cevap kabul edilmiyor" + help: "Bu konu kapatıldığı için artık yeni yanıt kabul edilmiyor" archived: help: "Bu başlık arşivlendi; donduruldu ve değiştirilemez" locked_and_archived: - help: "Bu konu kapatıldı ve arşivlendi; yeni cevaplar kabul edilemez ve değiştirilemez." + help: "Bu konu kapatıldı ve arşivlendi; yeni yanıtlar kabul edilemez ve değiştirilemez." unpinned: title: "En Yukarıda Sabitlenmesi Kaldırıldı" help: "Bu konu senin için artık en yukarıda sabitli değil, yani artık sırasıyla görüntülenecek" @@ -3199,18 +3202,21 @@ tr_TR: title: "Bu konu kişisel bir mesajdır" help: "Bu konu kişisel bir mesajdır" posts: "Gönderiler" + pending_posts: + label: "Bekleyen" + label_with_count: "Beklemede (%{count})" posts_likes_MF: | Bu konuda {ratio, select, low {düşük beğeni/gönderi oranına sahip} med {ortalama beğeni/gönderi oranına sahip} high {yüksek beğeni/gönderi oranına sahip} - other {}} {count, plural, one {1 cevap} other {# cevap}} var + other {}} {count, plural, one {1 yanıt} other {# yanıt}} var original_post: "Orjinal Gönderi" - views: "Görüntülenenler" + views: "Görüntüleme" views_lowercase: one: "gösterim" other: "görüntülenenler" - replies: "Cevaplar" + replies: "Yanıtlar" views_long: one: "bu konu %{count} defa görüntülendi" other: "bu konu %{number} defa görüntülendi" @@ -3306,8 +3312,8 @@ tr_TR: other_periods: "en çok ilgi görenlere bak:" browser_update: 'Maalesef tarayıcınız bu siteyi çalıştırmak için çok eski. Zengin içeriği görüntüleyebilmek, oturum açabilmek ve gönderileri yanıtlayabilmek için lütfen tarayıcınızı yükseltin' permission_types: - full: "Oluştur / Cevapla / Bak" - create_post: "Cevapla / Bak" + full: "Oluştur / Yanıtla / Bak" + create_post: "Yanıtla / Bak" readonly: "Bak" lightbox: download: "indir" @@ -3382,9 +3388,9 @@ tr_TR: pin_unpin_topic: "%{shortcut} Konuyu en yukarıda sabitle/sabitleme" share_topic: "%{shortcut} Konuyu paylaş" share_post: "%{shortcut} Gönderiyi paylaş" - reply_as_new_topic: "%{shortcut} Bağlantılı konu olarak cevapla" - reply_topic: "%{shortcut} Konuyu cevapla" - reply_post: "%{shortcut} Gönderiyi cevapla" + reply_as_new_topic: "%{shortcut} Bağlantılı konu olarak yanıtla" + reply_topic: "%{shortcut} Konuyu yanıtla" + reply_post: "%{shortcut} Gönderiyi yanıtla" quote_post: "%{shortcut} Gönderiyi alıntıla" like: "%{shortcut} Gönderiyi beğen" flag: "%{shortcut} Gönderiyi bayrakla işaretle" @@ -3429,7 +3435,7 @@ tr_TR: community: name: Topluluk trust_level: - name: Güven Seviyesi + name: Güven Düzeyi other: name: Diğer posting: @@ -3484,12 +3490,12 @@ tr_TR: delete_confirm_no_topics: "Bu etiketi silmek istediğinize emin misiniz?" delete_confirm_synonyms: one: "Eş anlamlısı da silinecek." - other: "%{count} isimli eşanlamlıları da silinecek." + other: "%{count} tane eşanlamlısı da silinecek." rename_tag: "Etiketi Yeniden Adlandır" rename_instructions: "Bu etiket için yeni bir ad seç:" sort_by: "Sırala:" sort_by_count: "say" - sort_by_name: "isim" + sort_by_name: "ad" manage_groups: "Etiket Grubunu Yönet" manage_groups_description: "Etiket grubunu yönetmek için grup tanımla" upload: "Etiketleri Yükle" @@ -3518,13 +3524,13 @@ tr_TR: description: "Bu etiketi içeren tüm konuları otomatik olarak izleyeceksin. Tüm yeni mesajlar ve konulardan haberdar edileceksin, ayrıca konuların yanında okunmamış ve yeni mesajların sayısı da görünecek." watching_first_post: title: "İlk gönderi izlemesi" - description: "Bu etiketteki yeni konular size bildirilecektir ancak konulara cevap verilmeyecektir." + description: "Bu etiketteki yeni konular size bildirilecektir; ancak konulara olan yanıtlar dışarıda bırakılacaktır." tracking: title: "Takip ediliyor" description: "Bu etiketi içeren tüm konuları otomatik olarak takip edeceksin. Konunun yanında okunmamış ve yeni yayınların sayısı görünecek." regular: title: "Düzenli" - description: "Birisi @isminden bahsederse veya gönderine cevap verirse bildirim alacaksın." + description: "Birisi @adınızdan bahsederse veya gönderinizi yanıtlarsa bildirim alacaksınız." muted: title: "Sessiz" description: "Bu etiketle yeni konular hakkında hiçbir şeyden haberdar edilmeyeceksin ve konular okunmamış sekmesinde görünmeyecek." @@ -3541,7 +3547,7 @@ tr_TR: parent_tag_description: "Bu gruptaki etiketler yalnızca üst etiket varsa kullanılabilir." one_per_topic_label: "Bu etiket grubundan her konu için bir etiket ile sınır koy" new_name: "Yeni Etiket Grubu" - name_placeholder: "İsim" + name_placeholder: "Ad" save: "Kaydet" delete: "Sil" confirm_delete: "Bu etiket grubunu silmek istediğine emin misin?" @@ -3603,8 +3609,8 @@ tr_TR: user_activity: no_activity_title: "Henüz aktivite yok" no_activity_others: "Aktivite yok." - no_replies_title: "Henüz hiçbir konuya cevap vermediniz" - no_replies_others: "Cevap yok." + no_replies_title: "Henüz hiçbir konuyu yanıtlamadınız." + no_replies_others: "Yanıt yok." no_drafts_title: "Hiç taslak başlatmadınız" no_likes_title: "Henüz hiçbir konuyu beğenmedin" no_likes_others: "Beğenilen gönderi yok." @@ -3750,7 +3756,7 @@ tr_TR: publish_read_state: "Grup mesajlarında grup okuma durumunu yayınla" membership: automatic: Otomatik - trust_levels_title: "Güven seviyesi, üyelere -eklendiklerinde- otomatik olarak verilir:" + trust_levels_title: "Güven düzeyi, üyelere -eklendiklerinde- otomatik olarak verilir:" effects: Etkileri trust_levels_none: "Hiçbiri" automatic_membership_email_domains: "Listede, e-posta alan adıyla tam olarak eşleşen kayıtlı kullanıcılar, otomatik olarak bu gruba eklenir:" @@ -3764,7 +3770,7 @@ tr_TR: title: "Gruplar" edit: "Grupları Düzenle" refresh: "Yenile" - about: "Grup üyeliğini ve isimleri burada düzenle" + about: "Grup üyeliğini ve adları burada düzenle" group_members: "Grup üyeleri" delete: "Sil" delete_confirm: "Grup silinsin mi?" @@ -3803,7 +3809,7 @@ tr_TR: description: Açıklama no_description: (açıklama yok) all_api_keys: Tüm API Anahtarları - user_mode: Kullanıcı Seviyesi + user_mode: Kullanıcı Düzeyi impersonate_all_users: Herhangi bir kullanıcı rolüne gir single_user: "Tekil kullanıcı" user_placeholder: Kullanıcı adı girin @@ -3883,7 +3889,7 @@ tr_TR: details: "Yeni bir konu oluşturulduğunda, düzenlendiğinde veya silindiğinde." post_event: name: "Gönderilen Etkinlik" - details: "Yeni bir cevap olduğunda, düzenlendiğinde veya silindiğinde." + details: "Yeni bir yanıt olduğunda, düzenlendiğinde veya silindiğinde." user_event: name: "Kullanıcı Etkinliği" details: "Bir kullanıcı giriş yaptığında, çıkış yaptığında, epostasını onayladığında, oluşturulduğunda, onaylandığında veya güncellendiğinde." @@ -3944,7 +3950,7 @@ tr_TR: plugins: title: "Eklentiler" installed: "Yüklü Eklentiler" - name: "İsim" + name: "Ad" none_installed: "Yüklenmiş herhangi bir eklentiniz yok." version: "Sürüm" enabled: "Etkin?" @@ -4068,7 +4074,7 @@ tr_TR: title: "Temalar" create: "Oluştur" create_type: "Tür" - create_name: "İsim" + create_name: "Ad" long_title: "Sitenin renklerini, CSS ve HTML içeriğini değiştir" edit: "Düzenle" edit_confirm: "Bu, uzak bir temadır. Eğer CSS / HTML'yi düzenlersen, temayı güncellediğinde değişiklikler silinir." @@ -4136,7 +4142,7 @@ tr_TR: included_components: "Dahil edilen bileşenler" add_all: "Hepsini ekle" import_web_tip: "Veri havuzu içeren tema" - direct_install_tip: "Aşağıdaki depodan %{name} isimli temayı yüklemek istediğinizden emin misiniz?" + direct_install_tip: "Aşağıdaki depodan %{name} adlı temayı yüklemek istediğinizden emin misiniz?" import_web_advanced: "Gelişmiş..." import_file_tip: "tema içeren .tar.gz, .zip veya .dcstyle.json dosyası" is_private: "Tema özel bir git veri havuzunda" @@ -4179,7 +4185,7 @@ tr_TR: one: "%{count} temalar geride kaldı!" other: "%{count} tema geride kaldı!" compare_commits: "(Yeni yorumlara bakınız)" - remote_theme_edits: "Bu temayı düzenlemek istiyorsanız, istediğiniz değişikliği deposuna göndermelisiniz" + remote_theme_edits: "Bu temayı düzenlemek istiyorsanız istediğiniz değişikliği deposuna göndermelisiniz." repo_unreachable: "Bu temanın Git deposuyla bağlantı kurulamadı. Hata mesajı:" imported_from_archive: "Bu tema bir .zip dosyasından içe aktarıldı" scss: @@ -4328,7 +4334,7 @@ tr_TR: html_preview: "E-posta İçeriği Önizlemesi" last_seen_user: "Son Görülen Kullanıcı:" no_result: "Özet için hiçbir sonuç bulunamadı." - reply_key: "Cevapla Tuşu" + reply_key: "Yanıtla Düğmesi" skipped_reason: "Nedeni Atla" incoming_emails: from_address: "Gönderen" @@ -4355,9 +4361,9 @@ tr_TR: filters: title: "Filtrele" user_placeholder: "kullanıcı adı" - address_placeholder: "isim@örnek.com" + address_placeholder: "ad@örnek.com" type_placeholder: "özet, kayıt olma..." - reply_key_placeholder: "cevapla tuşu" + reply_key_placeholder: "yanıtla düğmesi" moderation_history: performed_by: "Gerçekleştiren" no_results: "Mevcut bir moderasyon geçmişi yok" @@ -4403,7 +4409,7 @@ tr_TR: deleted: "Yeni değer yok. Kayıt silindi." actions: delete_user: "kullanıcıyı sil" - change_trust_level: "güven seviyesini değiştir" + change_trust_level: "güven düzeyini değiştir" change_username: "kullanıcı adını değiştir" change_site_setting: "site ayarlarını değiştir" change_theme: "temayı değiştir" @@ -4438,8 +4444,8 @@ tr_TR: deleted_unused_tags: "kullanılmayan etiketler silindi" renamed_tag: "yeniden adlandırılmış etiket" revoke_email: "e-postayı kaldır" - lock_trust_level: "güven seviyesini kilitle" - unlock_trust_level: "güvenlik seviyesi kilidini aç" + lock_trust_level: "güven düzeyini kilitle" + unlock_trust_level: "güvenlik düzeyi kilidini aç" activate_user: "kullanıcıyı etkinleştir." deactivate_user: "kullanıcıyı pasifleştir" change_readonly_mode: "salt-okunur modunu değiştir" @@ -4460,7 +4466,7 @@ tr_TR: delete_badge: "rozet sil" merge_user: "kullanıcıyı birleştir" entity_export: "ihracat birimi" - change_name: "isim değiştir" + change_name: "ad değiştir" topic_timestamps_changed: "konu zaman damgaları değişti" approve_user: "onaylanmış kullanıcı" web_hook_create: "webhook oluştur" @@ -4491,8 +4497,8 @@ tr_TR: post_staff_note_create: "personel notu ekle" post_staff_note_destroy: "personel notunu yok et" delete_group: "grubu sil" - watched_word_create: "izlenen kelime ekle" - watched_word_destroy: "izlenen kelimeyi sil" + watched_word_create: "izlenen sözcük ekle" + watched_word_destroy: "izlenen sözcüğü sil" screened_emails: title: "Taranmış E-postalar" description: "Biri yeni bir hesap oluşturmaya çalıştığında aşağıdaki e-posta adresleri kontrol edilecek ve kayıt önlenecek ya da başka bir eylem gerçekleşecek." @@ -4537,17 +4543,17 @@ tr_TR: logster: title: "Hata Kayıtları" watched_words: - title: "İzlenen Kelimeler" + title: "İzlenen Sözcükler" search: "ara" clear_filter: "Temizle" show_words: - one: "%{count} kelime göster" - other: "%{count} kelime göster" + one: "%{count} sözcük göster" + other: "%{count} sözcük göster" download: İndir clear_all: Tümünü Temizle - clear_all_confirm: "%{action} eylemi için izlenen tüm kelimeleri temizlemek istediğinizden emin misiniz?" - invalid_regex: '"%{word}" izlenen kelimesi geçersiz bir ifadedir.' - regex_warning: 'İzlenen kelimeler düzenli ifadelerdir ve otomatik olarak kelime sınırlarını içermiyorlar. İfadenin tam kelimelerle eşleşmesini istiyorsanız, ifadenizin başına ve sonuna \b ekleyin.' + clear_all_confirm: "%{action} eylemi için izlenen tüm sözcükleri temizlemek istediğinizden emin misiniz?" + invalid_regex: '"%{word}" izlenen sözcüğü geçersiz bir ifadedir.' + regex_warning: 'İzlenen sözcükler düzenli ifadelerdir ve otomatik olarak sözcük sınırlarını içermiyorlar. İfadenin tam sözcüklerle eşleşmesini istiyorsanız, ifadenizin başına ve sonuna \b ekleyin.' actions: block: "Engelle" censor: "Sansür" @@ -4558,17 +4564,17 @@ tr_TR: silence: "Sustur" link: "Bağlantı" action_descriptions: - block: "Bu kelimeleri içeren gönderilerin yayımlanmasını önle. Kullanıcı, gönderilerini yayımlamaya çalışırken bir hata mesajı görecek." - censor: "Bu kelimeleri içeren yayımlara izin ver ancak bu kelimeleri sansürlenmiş kelimeleri gizleyen karakterlerle değiştir." - require_approval: "Bu kelimeleri içeren gönderiler yayımlanmadan önce personel onayı gerektirir." - flag: "Bu kelimeleri içeren yayımlara izin ver ancak bunları uygunsuz olarak bayrakla işaretle. Böylece moderatörler bunları inceleyebilir." - replace: "Gönderilerdeki kelimeleri başka kelimelerle değiştirin" + block: "Bu sözcükleri içeren gönderilerin yayımlanmasını önle. Kullanıcı, gönderilerini yayımlamaya çalışırken bir hata mesajı görecek." + censor: "Bu sözcükleri içeren yayımlara izin ver ancak bu kelimeleri sansürlenmiş sözcükleri gizleyen karakterlerle değiştir." + require_approval: "Bu sözcükleri içeren gönderiler yayımlanmadan önce personel onayı gerektirir." + flag: "Bu sözcükleri içeren yayımlara izin ver ancak bunları uygunsuz olarak bayrakla işaretle. Böylece moderatörler bunları inceleyebilir." + replace: "Gönderilerdeki sözcükleri başka sözcüklerle değiştirin" tag: "Konuları ilk gönderiye göre otomatik olarak etiketleyin" - silence: "Kullanıcıların bu kelimeleri içeren ilk gönderileri, yayınlanmadan önce personel tarafından onaylanacak ve kullanıcı otomatik olarak susturulacaktır." - link: "Gönderilerdeki kelimeleri bağlantılarla değiştirin" + silence: "Kullanıcıların bu sözcükleri içeren ilk gönderileri, yayınlanmadan önce personel tarafından onaylanacak ve kullanıcı otomatik olarak susturulacaktır." + link: "Gönderilerdeki sözcükleri bağlantılarla değiştirin" form: - label: "Kelime veya kelime öbeği içerir" - placeholder: "Kelime veya kelime öbeği girin (* joker karakterdir)" + label: "Sözcük veya sözcük öbeği içerir" + placeholder: "Sözcük veya sözcük öbeği girin (* joker karakterdir)" placeholder_regexp: "güvenilir ifade" replace_label: "Değiştirme" replace_placeholder: "örnek" @@ -4579,11 +4585,11 @@ tr_TR: success: "Başarılı" exists: "Zaten mevcut" upload: "Dosyadan ekle" - upload_successful: "Yükleme başarılı oldu. Kelimeler eklendi." + upload_successful: "Yükleme başarılı oldu. Sözcükler eklendi." test: button_label: "Deneme" - modal_title: "%{action}: İzlenen Kelimeleri Test Et" - description: "İzlenen kelimelerle eşleşenleri kontrol etmek için aşağıya metin girin" + modal_title: "%{action}: İzlenen Sözcükleri Sına" + description: "İzlenen sözcüklerle eşleşenleri denetlemek için aşağıya metin girin" found_matches: "Bulunan eşlemeler:" no_matches: "Hiçbir eşleşme bulunamadı" impersonate: @@ -4612,11 +4618,11 @@ tr_TR: active: "Aktif Kullanıcılar" new: "Yeni Kullanıcılar" pending: "Gözden Geçirilecek Kullanıcılar" - newuser: "Güven seviyesi 0 (Yeni kullanıcı) olan kullanıcılar" - basic: "Güven seviyesi 1 (Ana kullanıcı) olan kullanıcılar" - member: "Güven seviyesi 2 (Üye) olan kullanıcılar" - regular: "Güven seviyesi 3 (Düzenli) olan kullanıcılar" - leader: "Güven seviyesi 4 (Lider) olan kullanıcılar" + newuser: "Güven düzeyi 0 (Yeni kullanıcı) olan kullanıcılar" + basic: "Güven düzeyi 1 (Ana kullanıcı) olan kullanıcılar" + member: "Güven düzeyi 2 (Üye) olan kullanıcılar" + regular: "Güven düzeyi 3 (Düzenli) olan kullanıcılar" + leader: "Güven düzeyi 4 (Lider) olan kullanıcılar" staff: "Görevli" admins: "Yöneticiler" moderators: "Moderatörler" @@ -4663,7 +4669,7 @@ tr_TR: view_edits: "Düzenlemeleri gör" penalty_post_actions: "İlişkili gönderi ile ne yapmak istiyorsun?" penalty_post_delete: "Gönderiyi sil" - penalty_post_delete_replies: "Bu gönderi ve bütün cevapları sil" + penalty_post_delete_replies: "Bu gönderiyi ve bütün yanıtları sil" penalty_post_edit: "Gönderiyi düzenle" penalty_post_none: "Hiçbir şey yapma" penalty_count: "Ceza Sayımı" @@ -4798,7 +4804,7 @@ tr_TR: reset_bounce_score: label: "Sıfırla" title: "Sekme puanını 0'a çek" - visit_profile: "Profilini güncellemek için kullanıcı tercihleri sayfası 'nı ziyaret et" + visit_profile: "Profilinizi güncellemek için kullanıcı tercihleri sayfası 'nı ziyaret edin" deactivate_explanation: "Pasifleştirilmiş kullanıcı e-postasını tekrar doğrulamalı." suspended_explanation: "Askıya alınmış kullanıcı giriş yapamaz." silence_explanation: "Susturulmuş bir kullanıcı gönderi oluşturamaz veya konu başlatamaz." @@ -4807,20 +4813,20 @@ tr_TR: none: "Bu e-postadan son zamanlarda hiç \"geri sekme\" alınmadı" some: "Bu e-posta adresinden yakın zamanda bazı \"geri sekme\"ler alındı." threshold_reached: "Bu e-posta adresinden birçok \"geri sekme\" alındı." - trust_level_change_failed: "Kullanıcının güven seviyesi değiştirilirken bir sorun yaşandı." + trust_level_change_failed: "Kullanıcının güven düzeyi değiştirilirken bir sorun yaşandı." suspend_modal_title: "Kullanıcıyı Askıya Al" confirm_cancel_penalty: "Cezadan vazgeçmek istediğinizden emin misiniz?" - trust_level_2_users: "Güven Seviyesi 2 Olan Kullanıcılar" - trust_level_3_requirements: "Güven Seviyesi 3 Gereksinimleri" - trust_level_locked_tip: "güven seviyesi kilitlendi, sistem kullanıcının seviyesini yükseltmeyecek veya düşürmeyecek" - trust_level_unlocked_tip: "güven seviyesi kilitli değil, sistem kullanıcının seviyesini yükseltebilir ya da düşürebilir" - lock_trust_level: "Güven Seviyesini Kilitle" - unlock_trust_level: "Güven Seviyesi Kilidini Aç" + trust_level_2_users: "Güven Düzeyi 2 Olan Kullanıcılar" + trust_level_3_requirements: "Güven Düzeyi 3 Gereksinimleri" + trust_level_locked_tip: "güven düzeyi kilitlendi, sistem kullanıcının düzeyini yükseltmeyecek veya düşürmeyecek" + trust_level_unlocked_tip: "güven düzeyi kilitli değil, sistem kullanıcının düzeyini yükseltebilir ya da düşürebilir" + lock_trust_level: "Güven Düzeyini Kilitle" + unlock_trust_level: "Güven Düzeyi Kilidini Aç" silenced_count: "Susturuldu" suspended_count: "Askıya Alınmış" last_six_months: "Son 6 ay" tl3_requirements: - title: "Güven Seviyesi 3 için Gerekenler" + title: "Güven Düzeyi 3 için Gerekenler" table_title: one: "Son %{count} günde:" other: "Son %{count} günde:" @@ -4828,7 +4834,7 @@ tr_TR: requirement_heading: "Gereksinim" visits: "Ziyaretler" days: "günler" - topics_replied_to: "Cevaplanan Konular" + topics_replied_to: "Yanıtlanan Konular" topics_viewed: "Görüntülenmiş Konular" topics_viewed_all_time: "Görüntülenmiş Konular (tüm zamanlar)" posts_read: "Okunmuş Gönderiler" @@ -4841,18 +4847,18 @@ tr_TR: likes_received_users: "Alınan beğeniler: Benzersiz kullanıcılar" suspended: "Askıya alındı (6 ay)" silenced: "Susturuldu (6 ay)" - qualifies: "Güven seviyesi 3 için hak kazanan" - does_not_qualify: "Güven seviyesi 3 için yeterli değil." + qualifies: "Güven düzeyi 3 için hak kazanmış." + does_not_qualify: "Güven düzeyi 3 için yeterli değil." will_be_promoted: "Yakında yükseltilecek." - will_be_demoted: "Yakında seviyesi düşürülecek" - on_grace_period: "Şu an terfisi tolerans süresinde, seviyesi düşürülmeyecek" - locked_will_not_be_promoted: "Güven seviyesi kilitlendi. Seviyesi hiçbir zaman yükseltilmeyecek." - locked_will_not_be_demoted: "Güven seviyesi kilitlendi. Seviyesi hiçbir zaman düşürülmeyecek." + will_be_demoted: "Yakında düzeyi düşürülecek." + on_grace_period: "Şu an terfisi tolerans süresinde, düzeyi düşürülmeyecek." + locked_will_not_be_promoted: "Güven düzeyi kilitlendi. Düzeyi hiçbir zaman yükseltilmeyecek." + locked_will_not_be_demoted: "Güven düzeyi kilitlendi. Düzeyi hiçbir zaman düşürülmeyecek." discourse_connect: title: "DiscourseConnect Single Sign On" external_id: "Harici Kimlik" external_username: "Kullanıcı Adı" - external_name: "İsim" + external_name: "Ad" external_email: "Eposta" external_avatar_url: "Profil URL Resmi" last_payload: "Son Yük" @@ -4944,7 +4950,7 @@ tr_TR: posting: "Gönderiler" email: "E-posta" files: "Dosyalar" - trust: "Güven Seviyeleri" + trust: "Güven Düzeyleri" security: "Güvenlik" onebox: "Kutulama" seo: "SEO" @@ -4979,7 +4985,7 @@ tr_TR: title: Rozetler new_badge: Yeni Rozet new: Yeni - name: İsim + name: Ad badge: Rozet display_name: Görünen Ad description: Açıklama @@ -5026,7 +5032,7 @@ tr_TR: none: "Her gün güncelle" post_action: "Kullanıcı gönderi üzerinde işlem yaptığında" post_revision: "Kullanıcı bir gönderiyi düzenlediğinde veya yeni bir gönderi oluşturduğunda" - trust_level_change: "Kullanıcı güven seviyesini değiştirdiğinde" + trust_level_change: "Kullanıcı güven düzeyini değiştirdiğinde" user_change: "Kullanıcı düzenlendiğinde veya oluşturduğunda" preview: link_text: "Verilen rozetleri önizle" @@ -5068,7 +5074,7 @@ tr_TR: title: "Emoji" add: "Yeni Emoji Ekle" uploading: "Yükleniyor..." - name: "İsim" + name: "Ad" group: "Grup" image: "Resim" alt: "özel emoji önizlemesi" @@ -5093,7 +5099,7 @@ tr_TR: embed_unlisted: "İlgili konuya bir yanıt gelene kadar içe aktarılan konular listelenmeyecek." allowed_embed_selectors: "Gömülü olarak izin verilen öğeler için CSS seçici" blocked_embed_selectors: "Gömülmüş öğelerden kaldırılan öğeler için CSS seçici" - allowed_embed_classnames: "İzin verilen CSS sınıfı isimleri" + allowed_embed_classnames: "İzin verilen CSS sınıfı adları" save: "Gömme Ayarlarını Kaydet" permalink: title: "Kalıcı Bağlantılar" @@ -5148,6 +5154,6 @@ tr_TR: previews: topic_title: "Bir tartışma konusu başlığı" share_button: "Paylaş" - reply_button: "Cevap" + reply_button: "Yanıt" topic_preview: "Konu önizlemesi" homepage_preview: "Ana sayfa önizlemesi" diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml index 77fee7d905..c04a7289e7 100644 --- a/config/locales/client.uk.yml +++ b/config/locales/client.uk.yml @@ -3462,6 +3462,9 @@ uk: title: "Ця тема є особистим повідомленням" help: "Ця тема є особистим повідомленням" posts: "Дописи" + pending_posts: + label: "Очікують" + label_with_count: "Очікують (%{count})" posts_likes_MF: | В цій темі {count, plural, one {1 повідомлення} other {# повідомлень}} {ratio, select, low {з високим рейтингом симпатій} diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml index dfc1ee5647..a89625b0d0 100644 --- a/config/locales/client.ur.yml +++ b/config/locales/client.ur.yml @@ -2764,6 +2764,9 @@ ur: title: "یہ ٹاپک ایک ذاتی پیغام ہے" help: "یہ ٹاپک ایک ذاتی پیغام ہے" posts: "پوسٹس" + pending_posts: + label: "زیرِاِلتوَاء" + label_with_count: "زیرِاِلتوَاء (%{count})" original_post: "اصل پوسٹ" views: "وِیوز" views_lowercase: diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml index 313c59c2a4..ed5a823884 100644 --- a/config/locales/client.vi.yml +++ b/config/locales/client.vi.yml @@ -2875,6 +2875,9 @@ vi: title: "Chủ đề này là một tin nhắn cá nhân" help: "Chủ đề này là một tin nhắn cá nhân" posts: "Bài viết" + pending_posts: + label: "Đang treo" + label_with_count: "Đang xử lý (%{count})" posts_likes_MF: | Chủ đề này có {count, plural, one {# trả lời} other {# trả lời}} {ratio, select, low {với tỷ lệ like trên post cao} diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index c5335f149b..834012e8c5 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -3071,6 +3071,9 @@ zh_CN: title: "此话题是一条个人消息" help: "此话题是一条个人消息" posts: "帖子" + pending_posts: + label: "待处理" + label_with_count: "待处理 (%{count})" posts_likes_MF: | 此话题有 {count, plural, other {# 个回复}}{ratio, select, low {，并且点赞发帖比例比较高} diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 163aeaadf7..07547dc4cc 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -2481,6 +2481,9 @@ zh_TW: unlisted: help: "此話題已被隱藏，不會顯示於話題列表，只能由直接連結存取。" posts: "貼文" + pending_posts: + label: "申請中" + label_with_count: "等待中 (%{count})" original_post: "原始貼文" views: "觀看" views_lowercase: diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index d934df7750..883158fbca 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -1711,7 +1711,6 @@ ar: allowed_iframes: "قائمة بادئات نطاقات iframe src التي يمكن أن يسمح بها Discourse بأمان في المنشورات" allowed_crawler_user_agents: "وكلاء المستخدمين لزاحفات الويب التي يجب السماح لها بالوصول إلى الموقع. تحذير! سيؤدي ضبط هذا الإعداد إلى عدم السماح بجميع الزاحفات غير المُدرَجة هنا!" blocked_crawler_user_agents: "الكلمة الفريدة غير حساسة لحالة الأحرف في سلسلة وكيل المستخدم والتي تحدِّد زاحفات الويب التي لا ينبغي السماح لها بالوصول إلى الموقع. لا تنطبق إذا تم تعريف قائمة السماح." - slow_down_crawler_user_agents: "وكلاء المستخدمين لزاحفات الويب التي يجب أن يكون معدَّلها محدودًا في ملف robots.txt باستخدام توجيه تأخير الزحف" slow_down_crawler_rate: "إذا تم تحديد slow_down_crawler_user_agents، فسيتم تطبيق هذا المعدَّل على جميع الزاحفات (عدد ثواني التأخير بين الطلبات)" content_security_policy: "تفعيل Content-Security-Policy" content_security_policy_report_only: "تفعيل Content-Security-Policy-Report-Only" diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml index db6d898ed4..0f197c2d86 100644 --- a/config/locales/server.be.yml +++ b/config/locales/server.be.yml @@ -958,7 +958,6 @@ be: blocked_ip_blocks: "Спіс прыватных IP-блокаў, якія ніколі не павінны сканіравацца дыскурсе" allowed_internal_hosts: "Спіс ўнутраных хастоў, дыскурс можа бяспечна паўзці для oneboxing і іншых мэтаў" allowed_iframes: "Спіс прэфіксаў дамена IFrame Src Дыскурс можа бяспечна дазволіць у паведамленнях" - slow_down_crawler_user_agents: "Агенты карыстальнікаў вэб-робатаў, якія павінны быць абмежаваныя ў хуткасці robots.txt з дапамогай дырэктывы Crawl затрымкі" slow_down_crawler_rate: "Калі slow_down_crawler_user_agents паказаны гэтая стаўка будзе прымяняцца да ўсіх сканэра (колькасць секунд затрымкі паміж запытамі)" content_security_policy: "Ўключыць Content-Security-Policy" content_security_policy_report_only: "Ўключыць Content-Security-Policy-Report-Only" diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml index 310ae161ef..c5c57a1bb7 100644 --- a/config/locales/server.ca.yml +++ b/config/locales/server.ca.yml @@ -1287,7 +1287,6 @@ ca: allowed_internal_hosts: "Llista d'amfitrions interns que Discourse pot rastrejar de manera segura per a onebox i altres finalitats." allowed_iframes: "Llista dels prefixos de domini en el codi d'iframe que Discourse pot permetre de manera segura en les publicacions" allowed_crawler_user_agents: "Agents d'usuari dels rastrejadors web als quals es permet accedir al lloc web. ATENCIÓ! ESTABLIR AIXÒ IMPEDIRÀ ACTUAR A TOTS ELS RASTREJADORS NO LLISTATS AQUÍ!" - slow_down_crawler_user_agents: "Agents d'usuari dels rastrejadors web que haurien de ser limitats en robots.txt utilitzant la directiva de retard (Crawl-delay)." slow_down_crawler_rate: "Si s'especifica slow_down_crawler_user_agents, aquesta ràtio s'aplicarà a tots els rastrejadors (nombre de segons de retard entre les sol·licituds)." content_security_policy: "Activa Content-Security-Policy (CSP)" content_security_policy_report_only: "Activa Content-Security-Policy-Report-Only" diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml index 813f5f9743..d0cf46f059 100644 --- a/config/locales/server.da.yml +++ b/config/locales/server.da.yml @@ -1411,7 +1411,6 @@ da: allowed_iframes: "En liste over iframe src-domænepræfikser, som discourse på sikker vis kan tillade i indlæg" allowed_crawler_user_agents: "Brugeragenter for webcrawlere, der skal have adgang til webstedet. ADVARSEL! INDSTILLES DETTE VIL ALLE CRAWLERE, DER IKKE ER ANGIVET HER BLIVE NÆGTET!" blocked_crawler_user_agents: "Entydigt store og små bogstaver i brugeragentstrengen, der identificerer webcrawlere, der ikke skal have adgang til webstedet. Gælder ikke, hvis tilladelsesliste er defineret." - slow_down_crawler_user_agents: "Brugeragenter for webcrawlere, der bør hastighedsbegrænses i robots.txt ved hjælp af Crawl-delay direktivet" slow_down_crawler_rate: "Hvis der er angivet slow_down_crawler_user_agents, gælder denne sats for alle crawlere (antal sekunders forsinkelse mellem anmodninger)" content_security_policy: "Aktivér indholds-sikkerheds-politik" content_security_policy_report_only: "Aktivér indholds-sikkerheds-politik-kun-rapportering" diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index 7b0d50036e..df0e1619ac 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -1414,6 +1414,7 @@ de: tl2_post_edit_time_limit: "Verfasser der Vertrauensstufen 2 und höher können ihre Beiträge (n) Minuten nach dem Schreiben noch ändern. 0 bedeutet immer." edit_history_visible_to_public: "Erlaube jedem, vorherige Versionen eines bearbeiteten Beitrags zu sehen. Wenn deaktiviert, sind diese nur für Team-Mitglieder sichtbar." delete_removed_posts_after: "Beiträge, die deren Verfasser selbst entfernt hat, werden nach (n) Stunden automatisch gelöscht. Die Beiträge werden sofort gelöscht, wenn dieser Wert auf 0 gesetzt wird." + notify_users_after_responses_deleted_on_flagged_post: "Wenn ein Beitrag markiert und dann entfernt wird, werden alle Benutzer, die auf den Beitrag geantwortet haben und deren Antworten entfernt wurden, benachrichtigt." max_image_width: "Maximale Breite von Vorschaubildern in einem Beitrag." max_image_height: "Maximale Höhe von Vorschaubildern in einem Beitrag." responsive_post_image_sizes: "Ändere die Größe der Lightbox-Vorschaubilder, um High-DPI-Bildschirme mit den folgenden Pixelverhältnissen zu ermöglichen. Entferne alle Werte, um responsive Bilder zu deaktivieren." @@ -1514,7 +1515,6 @@ de: allowed_iframes: "Eine Liste von iframe-src-Domain-Präfixen, die Discourse in Beiträgen sicher erlauben kann." allowed_crawler_user_agents: "Browserkennungen von Webcrawlern, denen der Zugriff auf die Website erlaubt sein soll. WARNUNG! DIESE EINSTELLUNG BLOCKIERT ALLE HIER NICHT GELISTETEN CRAWLER!" blocked_crawler_user_agents: "Eindeutiges Wort unter Vernachlässigung der Groß- und Kleinschreibung in der Zeichenfolge der Browserkennung, das Webcrawler identifiziert, die nicht auf die Website zugreifen dürfen. Gilt nicht, wenn die Positivliste definiert ist." - slow_down_crawler_user_agents: "Browserkennungen von Webcrawlern, deren Anfragezahl über die Direktive Crawl-delay in der Datei „robots.txt“ begrenzt werden soll." slow_down_crawler_rate: "Wenn slow_down_crawler_user_agents ausgewählt ist, wird diese Anfragenbegrenzung auf alle Crawler angewendet (Anzahl der Sekunden zwischen zwei Anfragen)" content_security_policy: "Aktiviere Content-Security-Policy" content_security_policy_report_only: "Aktiviere Content-Security-Policy-Report-Only" @@ -1551,6 +1551,7 @@ de: allow_index_in_robots_txt: "Lege in der robots.txt fest, dass diese Website von Websuchmaschinen indiziert werden darf. In Ausnahmefällen kannst du die robots.txt dauerhaft überschreiben." blocked_email_domains: "Eine durch senkrechte Striche getrennte Liste von E-Mail-Domains, die für die Registrierung neuer Konten nicht verwendet werden dürfen. Beispiel: mailinator.com|trashmail.net" allowed_email_domains: "Eine durch senkrechte Striche („|“) getrennte Liste von E-Mail-Domains, die für die Registrierung neuer Konten verwendet werden können. ACHTUNG: Benutzer mit E-Mail-Adressen anderer Domains werden nicht zugelassen!" + normalize_emails: "Überprüfe, ob normalisierte E-Mails eindeutig sind. Normalisierte E-Mail entfernt alle Punkte aus dem Benutzernamen und alles zwischen + und @ Symbolen." auto_approve_email_domains: "Benutzer mit E-Mail-Adressen aus dieser Liste von Domains werden automatisch genehmigt." hide_email_address_taken: "Teile Benutzern während der Registrierung und beim „Passwort vergessen“-Formular nicht mit, wenn ein Konto mit der angegebenen E-Mail-Adresse existiert." log_out_strict: "Beim Abmelden ALLE Sitzungen des Benutzers auf allen Geräten beenden" @@ -1740,6 +1741,9 @@ de: max_mentions_per_post: "Maximale Anzahl der Namenserwähnungen mit @, die Benutzer in Beiträgen nutzen dürfen." max_users_notified_per_group_mention: "Maximale Anzahl von Benutzern, die eine Benachrichtigung erhalten können, wenn eine Gruppe erwähnt wird (wenn der Schwellenwert erreicht ist, werden keine Benachrichtigungen ausgelöst)" enable_mentions: "Erlaube Benutzern, andere Benutzer zu erwähnen." + here_mention: "Name, der für die @here-Erwähnung verwendet wird. Darf kein bestehender Benutzername sein." + max_here_mentioned: "Maximale Anzahl der erwähnten Personen von @here." + min_trust_level_for_here_mention: "Die minimale Vertrauensstufe, die @hier erwähnt werden darf." create_thumbnails: "Erzeuge ein Vorschaubild und eine Lightbox für Bilder, die zu groß sind, um in einem Beitrag angezeigt zu werden." email_time_window_mins: "Warte (n) Minuten, bevor eine E-Mail-Benachrichtigung geschickt wird, um Benutzern Gelegenheit zu geben, ihre Beiträge abschließend bearbeiten zu können." personal_email_time_window_seconds: "Warte (n) Sekunden, bevor E-Mail-Benachrichtigungen zu persönlichen Nachrichten verschickt werden, um Benutzern die Gelegenheit zu geben, ihre Nachrichten abschließend bearbeiten zu können." @@ -2077,6 +2081,7 @@ de: invalid_css_color: "Ungültige Farbe. Gib einen Farbnamen oder einen Hexadezimalwert ein." invalid_email: "Ungültige E-Mail-Adresse." invalid_username: "Es gibt keinen Benutzer mit diesem Benutzernamen." + valid_username: "Es gibt einen Benutzer mit diesem Benutzernamen." invalid_group: "Es gibt keine Gruppe mit diesem Namen." invalid_integer_min_max: "Der Wert muss zwischen %{min} und %{max} liegen." invalid_integer_min: "Der Wert muss %{min} oder größer sein." @@ -2458,6 +2463,21 @@ de: test_mailer: title: "Test-E-Mail" subject_template: "[%{email_prefix}] Test der E-Mail-Zustellbarkeit" + text_body_template: | + Dies ist eine Test-E-Mail von + + [**%{base_url}**][0] + + Wir hoffen, Du hast diesen E-Mail-Zustellbarkeitstest erhalten. OK! + + Hier ist eine [praktische Checkliste zum Überprüfen der Konfiguration der E-Mail-Zustellung][1]. + + Viel Glück, + + Deine Freunde bei [Discourse](https://www.discourse.org) + + [0]: %{base_url} + [1]: https://meta.discourse.org/t/email-delivery-configuration-checklist/209839 new_version_mailer: title: "Neue Version" subject_template: "[%{email_prefix}] Neue Discourse-Version, Update verfügbar" @@ -2495,6 +2515,11 @@ de: inappropriate: "Dein Beitrag wurde als **unangemessen** gemeldet: Die Community denkt, dass er anstößig oder beleidigend ist oder einen Verstoß gegen [die Community-Richtlinien](%{base_path}/guidelines) darstellt." spam: "Dein Beitrag wurde als **Spam** gemeldet: Die Community denkt, dass es sich um Werbung handelt, zu werblich in seiner Art und nicht nützlich oder für das Diskussionsthema relevant ist." notify_moderators: "Dein Beitrag wurde **den Moderatoren gemeldet**: Die Community denkt, dass etwas an deinem Beitrag das Eingreifen eines Team-Mitglieds erfordert." + responder: + off_topic: "Der Beitrag wurde als **Thema verfehlt** gemeldet: Die Community denkt, dass er nicht zum Thema passt, wie es durch den Titel und den ersten Beitrag definiert wurde." + inappropriate: "Der Beitrag wurde als **unangemessen** gemeldet: Die Community denkt, dass er anstößig oder beleidigend ist oder einen Verstoß gegen [die Community-Richtlinien](%{base_path}/guidelines) darstellt." + spam: "Der Beitrag wurde als **Spam** gemeldet: Die Community denkt, dass es sich um Werbung handelt, zu werblich in seiner Art und nicht nützlich oder für das Diskussionsthema relevant ist." + notify_moderators: "Der Beitrag wurde **den Moderatoren gemeldet**: Die Community denkt, dass etwas an deinem Beitrag das Eingreifen eines Team-Mitglieds erfordert." flags_dispositions: agreed: "Danke, dass du uns Bescheid gegeben hast. Wir sind auch der Meinung, dass es ein Problem gibt, und sehen uns das an." agreed_and_deleted: "Danke, dass du uns Bescheid gegeben hast. Wir sind auch der Meinung, dass es ein Problem gibt, und haben den Beitrag gelöscht." @@ -2584,6 +2609,23 @@ de: ``` Weitere Informationen findest du in unseren [Community-Richtlinien](%{base_url}/guidelines). + flags_agreed_and_post_deleted_for_responders: + title: "Antwort wurde von Mitarbeitern aus dem markierten Beitrag entfernt" + subject_template: "Antwort wurde von Mitarbeitern aus dem markierten Beitrag entfernt" + text_body_template: | + Hallo, + + Dies ist eine automatische Nachricht von %{site_name} , um dich zu informieren, dass ein [Beitrag](%{base_url}%{url}), auf den du geantwortet hast, entfernt wurde. + + %{flag_reason} + + Dieser Beitrag wurde von der Community markiert und ein Mitarbeiter hat sich entschieden, ihn zu entfernen. + + ``` markdown + %{flagged_post_raw_content} + ``` + + Weitere Einzelheiten zum Grund für die Entfernung findest du in unseren [Community-Richtlinien](%{base_url}/guidelines). usage_tips: text_body_template: | Für einige schnelle Tipps, um als neuer Benutzer loszulegen, [schaue einmal diesen Blog-Beitrag an](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/). diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index a6ed300529..ed45365d58 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -1412,6 +1412,7 @@ es: tl2_post_edit_time_limit: "Un autor con NC2 puede editar su publicación durante (n) minutos luego de publicarla. Establece el valor en 0 para que siempre pueda hacerlo." edit_history_visible_to_public: "Permitir a todos ver las versiones previas de una publicación editada. Si se desactiva, solo los miembros del equipo podrán verlas." delete_removed_posts_after: "Las publicaciones eliminadas por su autor se eliminarán automáticamente después de (n) horas. Si se establece este valor a 0, las publicaciones se eliminarán inmediatamente." + notify_users_after_responses_deleted_on_flagged_post: "Al borrar una publicación reportada, notificar a los usuarios que hayan respondido y se vaya a borrar su respuesta." max_image_width: "Anchura máxima de las miniaturas de las imágenes en una publicación" max_image_height: "Altura máxima de las miniaturas de las imágenes en una publicación" responsive_post_image_sizes: "Cambiar el tamaño de las imágenes de vista previa de lightbox para permitir su visualización en pantallas de alto DPI de las siguientes proporciones de píxeles. Eliminar todos los valores para desactivar las imágenes responsivas." @@ -1511,7 +1512,6 @@ es: allowed_iframes: "Una lista de prefijos de dominios para iframe src que discourse puede permitir de forma segura en publicaciones" allowed_crawler_user_agents: "Agentes de usuario de crawlers a los que se debe permitir el acceso al sitio. ¡ADVERTENCIA! ¡CONFIGURAR ESTO INHABILITARÁ A TODOS LOS CRAWLERS QUE NO SE ENCUENTRAN AQUÍ!" blocked_crawler_user_agents: "Palabra única insensible a mayúsculas y minúsculas en la cadena del agente de usuario que identifica a los que no se debe permitir el acceso al sitio. No se aplica si se define una lista de permitidos." - slow_down_crawler_user_agents: "Agentes de usuario de crawlers a los que se debe aplicar una cuota limitada en robots.txt utilizando la directiva de retardo de rastreo" slow_down_crawler_rate: "Si slow_down_crawler_user_agents es especificado, esta proporción aplicará para todos los crawlers (número de segundos de demora entre solicitudes)" content_security_policy: "Activar la política de seguridad de contenido (CSP)" content_security_policy_report_only: "Activar solo el informe de la política de seguridad de contenido (CPS)" @@ -1548,6 +1548,7 @@ es: allow_index_in_robots_txt: "Especificar en robots.txt que se permite que este sitio sea indexado por los motores de búsqueda en Internet. En casos excepcionales, puedes sobrescribir robots.txt permanentemente." blocked_email_domains: "Lista de dominios de correo electrónico que no pueden ser utilizados para registrarse. Ejemplo: mailinator.com|trashmail.net" allowed_email_domains: "Una lista separada con barras verticales de dominios de correo electrónico que los usuarios DEBEN usar para registrar sus cuentas. ¡CUIDADO! No se permitirá el registro de usuarios cuyo correo electrónico sea de un dominio diferente a los aquí listados" + normalize_emails: "Comprobar si la dirección de correo normalizada es única. Para normalizar las direcciones se eliminan los puntos y todo lo que haya entre los caracteres + y @." auto_approve_email_domains: "Los usuarios con direcciones de correo electrónico de esta lista de dominios serán aprobados automáticamente." hide_email_address_taken: "No informar a los usuarios de la existencia de una cuenta con un correo electrónico dado durante el registro y desde el formulario de contraseña olvidada." log_out_strict: "Al cerrar sesión, cierra TODAS las sesiones del usuario en todos los dispositivos" @@ -2073,6 +2074,7 @@ es: invalid_css_color: "Color no válido. Introduce el nombre de un color o su valor hexadecimal." invalid_email: "Dirección de correo electrónico no válida." invalid_username: "No existe ningún usuario con ese nombre de usuario. " + valid_username: "Ya hay otro usuario con ese nombre de usuario." invalid_group: "No existe ningún grupo con ese nombre." invalid_integer_min_max: "El valor debe estar establecido entre %{min} y %{max}." invalid_integer_min: "El valor debe ser igual o mayor que %{min}. " @@ -2490,6 +2492,11 @@ es: inappropriate: "Tu publicación fue denunciada como **inapropiada**: la comunidad piensa que es ofensiva, abusiva o que vulnera alguna de las [directrices de la comunidad](%{base_path}/directrices)." spam: "Tu publicación fue denunciada como **spam**: la comunidad piensa que se trata de un anuncio, algo de naturaleza promocional, en vez de algo útil o relevante para lo que se espera del tema." notify_moderators: "Tu publicación fue denunciada para la **atención de un moderador**: la comunidad piensa que algo de esta publicación requiere la intervención manual de un miembro del equipo." + responder: + off_topic: "La publicación ha sido denunciada por **no tener relación con el tema**: la comunidad cree que no encaja con el tema, título y primer mensaje." + inappropriate: "La publicación ha sido denunciada por ser **inapropiada**: la comunidad cree que es ofensiva, abusiva o que incumple las [directrices de la comunidad](%{base_path}/guidelines)." + spam: "La publicación ha sido denunciada por ser **spam**: la comunidad cree que es un anuncio o algo de naturaleza promocional en vez de buscar ser útil o relevante para el tema." + notify_moderators: "La publicación ha sido denunciada para que sea **revisada por un moderador**: la comunidad cree que algo relacionado con ella requiere de la intervención de un miembro del equipo." flags_dispositions: agreed: "Gracias por avisarnos. Coincidimos con tu denuncia en que hay un problema y lo estamos revisando." agreed_and_deleted: "Gracias por avisarnos. Coincidimos con tu denuncia en que hay un problema y hemos quitado la publicación." @@ -2579,6 +2586,23 @@ es: ``` Por favor, revisa las [normas de la comunidad](%{base_url}/guidelines) para más información. + flags_agreed_and_post_deleted_for_responders: + title: "Respuesta a un mensaje denunciado eliminada por el personal" + subject_template: "Respuesta a un mensaje denunciado eliminada por el personal" + text_body_template: | + Hola, + + Esto es un mensaje automático de %{site_name} para hacerte saber que hemos eliminado una [publicación](%{base_url}%{url}) a la que has respondido. + + %{flag_reason} + + Esta publicación fue denunciada por la comunidad, y un miembro del equipo decidió eliminarla. + + ``` markdown + %{flagged_post_raw_content} + ``` + + Para más detalles sobre el motivo de la eliminación, revisa nuestras [directrices de la comunidad](%{base_url}/guidelines). usage_tips: text_body_template: | Si quieres unos consejos para empezar, [echa un vistazo a esta entrada de blog](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/). diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 579e56a3a7..542c2fb9e7 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -1498,7 +1498,6 @@ fi: allowed_iframes: "Iframe src -verkkotunnusten etuliitteet, jotka Discourse voi turvallisesti sallia viesteissä" allowed_crawler_user_agents: "Hakurobottien käyttäjäagentit, jotka saavat tulla sivustolle. VAROITUS! TÄMÄ ASETUS ESTÄÄ KAIKKI HAKUROBOTIT, JOITA EI LISTATA TÄSSÄ!" blocked_crawler_user_agents: "Käyttäjäagentin nimessä oleva kirjainkoosta riippumaton yksilöllinen merkkijono, jolla tunnistetaan estettävät hakurobotit. Ei sovelleta, jos sallittujen hakurobottien luettelo on määriteltynä." - slow_down_crawler_user_agents: "Hakurobottien käyttäjäagentit, joiden toiminnan nopeutta rajoitetaan hakuviivemääräyksen (Crawl-delay directive) mukaisesti" slow_down_crawler_rate: "Jos slow_down_crawler_user_agents on määritelty, tämä nopeusrajoitus koskee kaikkia hakurobotteja (kuinka monta sekuntia pitää kulua pyyntöjen välillä)" content_security_policy: "Ota käyttöön epäilyttävän sisällön seulonta (Content-Security-Policy)" content_security_policy_report_only: "Ota käyttöön epäilyttävästä sisällöstä raportointi (Content-Security-Policy-Report-Only)" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index b10a27d496..e193ac75d1 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -1498,7 +1498,6 @@ fr: allowed_iframes: "Une liste des préfixes du domaine src iframe que Discourse peut autoriser en toute sécurité dans les messages" allowed_crawler_user_agents: "Les agents utilisateurs des robots d'indexation qui sont autorisés à accéder au site. ATTENTION : CE PARAMÈTRE BLOQUERA TOUS LES ROBOTS D'INDEXATION NON LISTÉS ICI !" blocked_crawler_user_agents: "Mot unique insensible à la casse dans la chaîne de caractères de l'agent utilisateur identifiant les robots d'exploration Web qui ne devraient pas être autorisés à accéder au site. Ne s'applique pas si la liste d'autorisations est définie." - slow_down_crawler_user_agents: "Agents utilisateurs des robots d'indexation qui devraient être limités dans robots.txt avec la commande Crawl-delay" slow_down_crawler_rate: "Si slow_down_crawler_user_agents est défini, ce taux s'appliquera à tous les robots d'indexation (nombre de secondes d'attente entre requêtes)" content_security_policy: "Activer Content-Security-Policy" content_security_policy_report_only: "Activer Content-Security-Policy-Report-Only" diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml index eba4bdb4dc..fb528e9a16 100644 --- a/config/locales/server.gl.yml +++ b/config/locales/server.gl.yml @@ -1446,7 +1446,6 @@ gl: allowed_iframes: "Unha listaxe de prefixos de dominios para iframe src que Discourse pode permitir de forma segura en publicacións" allowed_crawler_user_agents: "Axentes de usuario de rastreadores web aos que se lles debería permitir o acceso ao sitio. AVISO! AO CONFIGURAR ISTO, VETARÁ TODOS OS RASTREXADORES NON LISTADOS AQUÍ!" blocked_crawler_user_agents: "Palabra única insensíbel a maiúsculas e minúsculas na cadea de axente de usuario que identifica rastrexadores web que non deberían ter permitido o acceso ao sitio. Non se lle aplica se está definida a listaxe de permitidos." - slow_down_crawler_user_agents: "Axentes de usuario de rastrexadores web aos que se lles debe aplicar unha cota limitada en robots.txt utilizando a directiva de atraso no rastrexo" slow_down_crawler_rate: "Se slow_down_crawler_user_agents está especificado, este valor aplicarase a todos os rastrexadores (número de segundos de demora entre respostas)" content_security_policy: "Activar a política de seguridade de contido (CSP)" content_security_policy_report_only: "Activar só o informe de política de seguridade de contido" diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index ac934a45e8..50e29a5786 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -974,6 +974,7 @@ he: others: "אין סימניות." no_drafts: self: "אין לך טיוטות, ניתן להתחיל לכתוב תגובה בכל נושא שהוא והוא יישמר אוטומטית כטיוטה חדשה." + no_log_search_queries: "שאילתות מול יומן החיפושים מושבתות (הנהלת המערכת יכולה להפעיל אותן בהגדרות האתר)." email_settings: pop3_authentication_error: "אירעה תקלה עם פרטי הגישה שסופקו עבור POP3, נא לבדוק את שם המשתמש והססמה ולנסות שוב." imap_authentication_error: "אירעה תקלה עם פרטי הגישה שסופקו עבור IMAP, נא לבדוק את שם המשתמש והססמה ולנסות שוב." @@ -1592,7 +1593,6 @@ he: allowed_iframes: "רשימה של קידומות שמות מתחם בתור מקור של iframe שאפשר לאפשר בבטחה בפוסטים ב־Discourse" allowed_crawler_user_agents: "סוכני משתמשים של סורקי רשת שמורשים לגשת לאתר. אזהרה! שינוי הגדרה זו תחסום את כל הסורקים שאינם מופיעים כאן!" blocked_crawler_user_agents: "מילה ייחודית שאינה תלוית רישיות במחרוזת סוכן המשתמש (user agent) שמגדירה לאילו סורקי רשת אין הרשאת גישה לאתר. לא חל במקרה שהגדרת רשימת היתר." - slow_down_crawler_user_agents: "סוכני משתמש (user agents) של סורקי אינטרנט אמורים להיות כפופים להגבלת קצב דרך robots.txt בעזרת ההנחיה Crawl-delay (השהיית סריקה)" slow_down_crawler_rate: "אם הוגדר slow_down_crawler_user_agents (האטת סורקי אינטרנט) קצב זה יחול על כל סורקי האינטרנט (כמות ההמתנה בשניות בין בקשות)" content_security_policy: "הפעלת Content-Security-Policy (מדיניות אבטחת תוכן)" content_security_policy_report_only: "הפעלת Content-Security-Policy-Report-Only (מדיניות אבטחת תוכן בדיווח בלבד)" @@ -1629,6 +1629,7 @@ he: allow_index_in_robots_txt: "יש לציין ב־robots.txt שמותר לאתר הזה להצטרף למאגר של מנועי החיפוש. במקרים יוצאי דופן, ניתן לדרוס את robots.txt באופן קבוע." blocked_email_domains: "רשימה מופרדת בקווים אנכיים (|) של שמות תחום דוא״ל שאסור להירשם דרכם. למשל: mailinator.com|trashmail.net" allowed_email_domains: "רשימה מופרדת בקווים אנכיים (|) של שמות תחום דוא״ל שמולם חייבים המשתמשים להיות רשומים. אזהרה: משתמשים שכתובת הדוא״ל שלהם אינה רשומה תחת שמות התחום שברשימה לא יורשו!" + normalize_emails: "לבדוק אם הדוא״ל המנורמל הוא ייחודי. כתובת דוא״ל מנורמלת מסירה את כל הנקודות משם המשתמש וכל מה שבין הסימנים + ו־@." auto_approve_email_domains: "משתמשים עם כתובות דוא״ל מרשימת שמות התחום האלה יאושרו אוטומטית." hide_email_address_taken: "לא להודיע למשתמשים שקיים חשבון עם כתובת דוא״ל מסוימת במהלך ההרשמה ובטופס שחזור הססמה." log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמש/ת בכל המכשירים" @@ -1818,6 +1819,9 @@ he: max_mentions_per_post: "מספר מקסימלי של התראות @שם_משתמש שיכול כל אחד/אחת להכליל בפוסט." max_users_notified_per_group_mention: "מספר מקסימלי של משתמשים שיכולים לקבל התראה אם מוזכרת קבוצה (אם מגיעים לסף זה לא תועלה התראה)" enable_mentions: "לאפשר למשתמשים לאזכר משתמשים אחרים." + here_mention: "השם המשמש לאיזכור ‎@here. לא יכול להיות שם משתמש קיים." + max_here_mentioned: "מספר האנשים המרבי שמוזכרים על ידי ‎@here." + min_trust_level_for_here_mention: "דרגת האמון המזערית המורשית להזכיר את ‎@here." create_thumbnails: "יצירת תמונות מוקטנות והארת תמונות גדולות מידי מלהיכלל בפוסט." email_time_window_mins: "המתינו (n) דקות לפני משלוח כל התראת מייל, כדי לאפשר למשתמשים הזדמנות לערוך ולוודא באופן סופי את הפוסטים שלהם." personal_email_time_window_seconds: "להמתין (n) שניות בטרם שליחת הודעות בדוא״ל עם התראות על הודעות אישיות, כדי לתת למשתמשים הזדמנות לסיים את עריכת ההודעות שלהם." @@ -2153,6 +2157,7 @@ he: invalid_css_color: "צבע שגוי. נא למלא את שם הצבע או ערך הקסדצימלי." invalid_email: "כתובת דוא״ל שגויה." invalid_username: "אין משתמש/ת עם שם משתמש כזה." + valid_username: "יש משתמש עם שם משתמש כזה." invalid_group: "אין קבוצה בשם הזה." invalid_integer_min_max: "הערך חייב להיות בין %{min} ל-%{max}." invalid_integer_min: "הערך חייב להיות %{min} ומעלה." diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml index 49665e1c3c..84e4ba2506 100644 --- a/config/locales/server.hu.yml +++ b/config/locales/server.hu.yml @@ -416,6 +416,7 @@ hu: post: image_placeholder: broken: "Ez a kép hibás" + hidden_bidi_character: "A kétirányú karakterek megváltoztathatják a szöveg megjelenítési sorrendjét. Ez felhasználható rosszindulatú kódok elrejtésére is." has_likes: one: "%{count} kedvelés" other: "%{count} kedvelés" @@ -866,11 +867,13 @@ hu: site_settings: disabled: "kikapcsolva" max_emojis_in_title: "A témacímekben lévő emodzsik legnagyobb száma" + notify_users_after_responses_deleted_on_flagged_post: "Ha egy bejegyzést jelentenek, majd eltávolítanak, akkor minden olyan felhasználó értesítést kap, aki válaszolt a bejegyzésre, és ezért a válaszait eltávolították." post_excerpt_maxlength: "A bejegyzés kivonatának / összefoglalójának maximális hossza." topic_excerpt_maxlength: "A témakör kivonatának / összefoglalójának maximális hossza a téma első bejegyzéséből generálva." enforce_second_factor: "Kényszeríti a felhasználókat, hogy engedélyezzék a kétfaktoros hitelesítést. Válassza az 'all' lehetőséget, hogy érvényesítse az összes felhasználó számára. Válassza a „személyzet” lehetőséget, hogy csak a személyzet felhasználói számára érvényesítse." use_admin_ip_allowlist: "Az adminokk csak akkor tudnak bejelentkezni, ha a Screened IPs listában megadott IP-címmel vannak megadva (Admin > Naplók > Screened Ips)." enable_badges: "A jelvény rendszer engedélyezése" + normalize_emails: "Ellenőrizze, hogy a normalizált e-mail egyedi-e. A normalizált e-mail eltávolítja az összes pontot a felhasználónévből, és mindent, ami a + és a @ szimbólumok között található." min_password_length: "Minimum jelszóhossz." block_common_passwords: "A 10 000 leggyakoribb jelszó tiltása." rate_limit_new_user_create_topic: "Egy téma létrehozása után az új felhasználóknak (n) másodpercet kell várniuk, mielőtt új témát hoznának létre." @@ -882,6 +885,9 @@ hu: selectable_avatars: "A felhasználó által választható avatarok listája." recompress_original_jpg_quality: "A feltöltött képfájlok minősége (1 – legalacsonyabb, 99 – legjobb, 100 – letiltás)." image_preview_jpg_quality: "Az átméretezett képfájlok minősége (1 – legalacsonyabb, 99 – legjobb, 100 – letiltás)." + here_mention: "Az @itt megemlítéshez használandó név. Nem lehet létező felhasználónév." + max_here_mentioned: "Az @itt által megemlített személyek maximális száma." + min_trust_level_for_here_mention: "Az @itt megemlítés használatához szükséges minimális bizalmi szint." dark_mode_none: "Egyik sem" cold_age_days_low: "Ennyi nap beszélgetés után az utolsó tevékenység dátuma kissé elhomályosul." reply_by_email_enabled: "E-mail válaszok engedélyezése." @@ -902,6 +908,7 @@ hu: errors: invalid_email: "Érvénytelen e-mail cím." invalid_username: "Nincs ilyen nevű felhasználó." + valid_username: "Van egy ilyen nevű felhasználó." invalid_integer_min_max: "Az értéknek %{min} és %{max} között kell lennie." invalid_integer_min: "Az érték nem lehet kisebb, mint %{min}." invalid_integer_max: "Az érték nem lehet nagyobb, mint %{max}." @@ -993,6 +1000,28 @@ hu: %{base_url}/u/password-reset /%{email_token} (Ha a fenti link lejárt, válaszd az "Elfelejtettem a jelszavamat" lehetőséget, amikor bejelentkezel ezzel az e-mail címeddel.) + test_mailer: + text_body_template: | + Ez egy teszt e-mail innen: + + [**%{base_url}**][0] + + Reméljük, hogy rendben megkapta ezt a kézbesítési teszt e-mailt! + + Itt egy [hasznos ellenőrzőlista az e-mail kézbesítési beállításokról][1]. + + Sok szerencsét, + + A barátai a [Discourse-nál](https://www.discourse.org) + + [0]: %{base_url} + [1]: https://meta.discourse.org/t/email-delivery-configuration-checklist/209839 + flag_reasons: + responder: + off_topic: "Ezt a bejegyzést **nem témába vágóként** jelentették: a közösség úgy érzi, hogy a cím és az első bejegyzés alapján nem felel meg a témának." + inappropriate: "Ezt a bejegyzést **nem helyénvalónak** jelentették: a közösség úgy érzi, hogy sértő, káros vagy megsérti a [közösségi irányelveket](%{base_path}/guidelines)." + spam: "Ezt a bejegyzést **kéretlen tatalomként** jelentették: a közösség úgy érzi, hogy reklám, túlságosan hirdetésjellege van, ahelyett hogy hasznos vagy releváns lenne a témában." + notify_moderators: "Ezt a bejegyzést **moderátori figyelmet igénylőnek** jelentették: a közösség úgy érzi, hogy a bejegyzéssel kapcsolatosan valami kézi beavatkozást igényel egy stábtag részéről." flags_dispositions: agreed: "Köszönjük, hogy szóltál! Mi is úgy látjuk, hogy van itt egy probléma, vizsgáljuk!" agreed_and_deleted: "Köszönjük, hogy szóltál! Mi is úgy látjuk, hogy van itt egy probléma, ezért letöröltük a posztot." @@ -1059,6 +1088,23 @@ hu: %{flagged_post_raw_content} ``` További útmutatásért olvasd el a [fórumunk szabályzatát](%{base_url}/guidelines)! + flags_agreed_and_post_deleted_for_responders: + title: "A stáb eltávolította a választ egy jelentett bejegyzésről" + subject_template: "A stáb eltávolította a választ egy jelentett bejegyzésről" + text_body_template: | + Üdv! + + Ez egy automatikus üzenet a(z) %{site_name} oldalról, hogy tudja, hogy a [bejegyzéshez](%{base_url}%{url}) küldött válaszát eltávolították. + + %{flag_reason} + + A bejegyzést a közösség jelentette, és egy stábtag úgy döntött, hogy eltávolítja. + + ``` markdown + %{flagged_post_raw_content} + ``` + + Az eltávolítás további okaiért nézze meg a [közösségi irányelveket](%{base_url}/guidelines). welcome_user: subject_template: "Üdvözöljük a(z) %{site_name} oldalon." text_body_template: | diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml index d3c1d0cca8..1de6ae0b72 100644 --- a/config/locales/server.hy.yml +++ b/config/locales/server.hy.yml @@ -1145,7 +1145,6 @@ hy: blocked_ip_blocks: "Մասնավոր IP արգելափակումների ցանկ, որոնք երբեք չպետք է ենթարկվեն տվյալների հավաքագրման Discourse-ի կողմից:" allowed_internal_hosts: "Ներքին հոսթերի ցանկ, որը discourse-ը կարող է ապահով հավաքագրել սմարթ-ներդիրի և այլ նպատակների համար" allowed_iframes: "iframe src դոմենի նախամասնիկներ, որ discourse-ը կարող է ապահով թույլատրել գրառումներում" - slow_down_crawler_user_agents: "Ցանցային տվյալների հավաքագրիչների օգտատերերի գործակալներ, որոնք պետք է սահմանափակված լինեն robots.txt-ով՝ օգտագործելով Crawl-delay ուղղորդիչը" slow_down_crawler_rate: "Եթե slow_down_crawler_user_agents -ը որոշված է, այս գնահատականը կկիրառվի տվյալների բոլոր հավաքագրիչների նկատմամբ (հարցումների միջև դադարի վայրկյանների քանակը)" content_security_policy: "Միացնել Content-Security-Policy" content_security_policy_report_only: "Միացնել Content-Security-Policy-Report-Only" diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index a9891f8c2a..f4bee3a007 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -206,6 +206,8 @@ it: local_login_cannot_be_disabled_if_second_factor_enforced: "Non è possibile disabilitare l'accesso locale se 2FA è abilitato. Disabilitare 2FA prima di disabilitare gli accessi locali." cannot_enable_s3_uploads_when_s3_enabled_globally: "Non puoi abilitare i caricamenti S3 perché sono già abilitati a livello globale e l'abilitazione dei caricamenti S3 a livello di sito potrebbe causare problemi critici con i caricamenti" cors_origins_should_not_have_trailing_slash: "Non aggiungere la barra finale (/) alle origini CORS." + slow_down_crawler_user_agent_must_be_at_least_3_characters: "Gli user agent devono essere lunghi almeno 3 caratteri per evitare di limitare erroneamente la velocità degli utenti umani." + slow_down_crawler_user_agent_cannot_be_popular_browsers: "Non puoi aggiungere nessuno dei seguenti valori all'impostazione: %{values}." conflicting_google_user_id: 'Il Google Account ID per questo account è stato modificato; per motivi di sicurezza è richiesto l''intervendo dello staff. Si prega di contattare lo staff e indirizzarli a
https://meta.discourse.org/t/76575' onebox: invalid_address: "Purtroppo è stato impossibile creare un'anteprima per questa pagina, perché non è stato trovato il server '%{hostname}'. Nel tuo post apparirà solo un link senza anteprima. :cry:" @@ -1411,6 +1413,7 @@ it: tl2_post_edit_time_limit: "Un autore TL2+ può modificare il proprio messaggio per (n) minuti dopo la pubblicazione. Impostando l'opzione a 0, essa è sempre attiva." edit_history_visible_to_public: "Permetti a tutti di vedere le precedenti versioni di un messaggio modificato. Se disabilitato solo i membri dello staff possono vederle." delete_removed_posts_after: "I messaggi rimossi dall'autore saranno automaticamente cancellati dopo (n) ore. Se impostato a 0, i messaggi saranno cancellati subito." + notify_users_after_responses_deleted_on_flagged_post: "Quando un messaggio viene segnalato e poi cancellato, tutti gli utenti che avevano risposto al messaggio e le cui risposte di conseguenza sono state cancellate, riceveranno una notifica." max_image_width: "Larghezza massima delle miniature delle immagini in un messaggio" max_image_height: "Altezza massima delle miniature delle immagini in un messaggio" responsive_post_image_sizes: "Ridimensiona le immagini di anteprima del lightbox per consentire schermate ad alto DPI per le proporzioni pixel seguenti. Rimuovi tutti i valori per disabilitare le immagini reattive." @@ -1509,7 +1512,7 @@ it: allowed_iframes: "Un elenco di prefissi di dominio src iframe che discourse può consentire in modo sicuro nei messaggi" allowed_crawler_user_agents: "User Agent dei crawler Web che dovrebbero poter accedere al sito. ATTENZIONE! IMPOSTANDO TALE OPZIONE SARANNO BLOCCATI TUTTI I CRAWLER NON ELENCATI QUI!" blocked_crawler_user_agents: "Parola univoca, senza distinzione tra maiuscole e minuscole, nella stringa user agent che identifica i web crawler cui non si vuole consentire l'accesso al sito. L'impostazione non si applica se è stata definita una lista di elementi consentiti." - slow_down_crawler_user_agents: "User agent di crawler Web che devono essere limitati in frequenza in robots.txt utilizzando la direttiva Crawl-delay" + slow_down_crawler_user_agents: "Gli user agent dei web crawler a cui impostare limiti di velocità come configurato nell'impostazione \"rallenta la velocità dei crawler\". Ogni valore deve essere lungo almeno 3 caratteri." slow_down_crawler_rate: "Se viene specificato slow_down_crawler_user_agents, tale frequenza verrà applicata a tutti i crawler (numero di secondi di ritardo tra le richieste)" content_security_policy: "Abilita Content-Security-Policy" content_security_policy_report_only: "Abilita Content-Security-Policy-Report-Only" @@ -1546,6 +1549,7 @@ it: allow_index_in_robots_txt: "Specifica in robots.txt che questo sito permette l'indicizzazione da parte dei motori di ricerca. In casi eccezionali puoi permanentemente ignorare robots.txt." blocked_email_domains: "Una lista di domini email separati dal carattere pipe \"|\" con cui gli utenti non possono registrare un account. Ad esempio: mailinator.com|trashmail.net" allowed_email_domains: "Una lista di domini email delimitati da carattere pipe (|) che gli utenti DEVONO usare per poter registrare i propri account. ATTENZIONE: gli utenti con domini email differenti da questi non saranno accettati!" + normalize_emails: "Controlla se l'email normalizzata è univoca. L'email normalizzata è il nome utente senza tutti i puntini e senza tutto ciò che è compreso tra i simboli + e @." auto_approve_email_domains: "Gli utenti con indirizzi email appartenenti a questo elenco di domini verranno approvati automaticamente." hide_email_address_taken: "Durante l'iscrizione e nel modulo per la password dimenticata, non informare gli utenti che già esiste un account con un dato indirizzo email." log_out_strict: "Quando ci si disconnette, esci da TUTTE le sessioni dell'utente su tutti i dispositivi" @@ -2435,6 +2439,21 @@ it: test_mailer: title: "Test Mailer" subject_template: "[%{email_prefix}] Test di Consegna Email" + text_body_template: | + Questa è una mail di prova da + + [**%{base_url}**][0] + + Ci auguriamo che ti sia stata recapitata senza problemi! + + Ecco un'utile [lista per verificare le impostazioni di consegna del tuo servizio di posta elettronica][1]. + + In bocca al lupo, + + I tuoi amici di [Discourse](https://www.discourse.org) + + [0]: %{base_url} + [1]: https://meta.discourse.org/t/email-delivery-configuration-checklist/209839 new_version_mailer: title: "Mailer Nuova Versione" subject_template: "[%{email_prefix}] Nuova versione di Discourse, aggiornamento disponibile" @@ -2446,6 +2465,11 @@ it: inappropriate: "Il tuo messaggio è stato segnalato come **inappropriato**: la comunità lo ritiene offensivo, ingiurioso o una violazione delle [linee guida della comunità](%{base_path}/guidelines)." spam: "Il tuo messaggio è stato segnalato come **spam**: la comunità ritiene che sia pubblicità o qualcosa di natura meramente promozionale invece di essere utile o rilevante per l'argomento, come invece ci si aspetterebbe." notify_moderators: "Il tuo messaggio è stato segnalato **all'attenzione dei moderatori**: la comunità ritiene che ci sia qualcosa nel messaggio che richiede l'intervento manuale di un membro dello staff." + responder: + off_topic: "Il messaggio è stato segnalato come **fuori-tema**: la comunità ritiene che non sia adatto all'argomento, così come definito dal titolo e dal primo messaggio." + inappropriate: "Il messaggio è stato segnalato come **inappropriato**: la comunità ritiene che sia offensivo, ingiurioso oppure rappresenti una violazione delle [nostre linee guida](%{base_path}/guidelines)." + spam: "Il messaggio è stato segnalato come **spam**: la comunità ritiene che sia una pubblicità, o qualcosa eccessivamente promozionale invece di essere utile o pertinente all'argomento come previsto." + notify_moderators: "Il messaggio è stato contrassegnato **all'attenzione del moderatore**: la comunità ritiene che qualcosa nel messaggio richieda l'intervento manuale di un membro dello staff." flags_dispositions: agreed: "Grazie per averci informato. Sappiamo che c'è un problema e lo stiamo analizzando." agreed_and_deleted: "Grazie per averci informato. Sappiamo che c'è un problema e abbiamo cancellato il messaggio." @@ -2511,6 +2535,10 @@ it: title: "Post segnalato rimosso dallo staff" subject_template: "Post segnalato rimosso dallo staff" text_body_template: "Ciao,\n\nQuesto è un messaggio automatico generato da %{site_name} per informarti che [il tuo messaggio](%{base_url}%{url}) è stato rimosso. \n\n%{flag_reason}\n\nIl messaggio è stato segnalato dalla comunità e un membro dello staff ha deciso di rimuoverlo. \n \n```markdown\n%{flagged_post_raw_content}\n```\n\nPer ulteriori dettagli, consulta le nostre [linee guida della community](%{base_url}/guidelines).\n" + flags_agreed_and_post_deleted_for_responders: + title: "Risposta rimossa dal messaggio segnalato da parte dello staff" + subject_template: "Risposta rimossa dal messaggio segnalato da parte dello staff" + text_body_template: "Ciao,\n\nQuesto è un messaggio automatico generato da %{site_name} per informarti che [un messaggio](%{base_url}%{url}) al quale avevi risposto è stato rimosso. \n\n%{flag_reason}\n\nIl messaggio è stato segnalato dalla comunità quindi un membro dello staff ha deciso di rimuoverlo. \n \n```markdown\n%{flagged_post_raw_content}\n```\n\nPer ulteriori dettagli sul motivo della cancellazione, consulta le [linee guida della comunità](%{base_url}/guidelines).\n" usage_tips: text_body_template: | Per leggere alcuni veloci suggerimenti su come iniziare se sei un nuovo utente [dai una lettura a questo articolo](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/) diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index aeb7435102..b154d21805 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -1449,7 +1449,6 @@ ja: allowed_iframes: "Discourse が投稿で安全に許可できる iframe src ドメインプレフィックスのリスト" allowed_crawler_user_agents: "サイトへのアクセスを許可する必要のあるウェブクローラーのユーザーエージェント。警告！これを設定すると、ここにリストされていないすべてのクローラーが拒否されます！" blocked_crawler_user_agents: "サイトへのアクセスを許可してはいけないウェブクローラーを識別する、ユーザーエージェント文字列の大文字と小文字を区別しない一意の語。ホワイトリストが定義されている場合は適用されません。" - slow_down_crawler_user_agents: "Crawl-delay ディレクティブを使用して robots.txt でレート制限する必要があるウェブクローラーのユーザーエージェント" slow_down_crawler_rate: "このレートに slow_down_crawler_user_agents が指定されている場合、このレートはすべてのクローラーに適用されます (リクエスト間の遅延秒数)" content_security_policy: "Content-Security-Policy を有効にする" content_security_policy_report_only: "Content-Security-Policy-Report-Only を有効にする" diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index 4124a9825c..521d6bd4e7 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -1459,7 +1459,6 @@ ko: allowed_iframes: "Discourse가 안전한 게시물로 허용 할 수있는 iframe src 도메인 접두사 목록" allowed_crawler_user_agents: "사이트에 대한 액세스를 허용해야하는 웹 크롤러의 사용자 에이전트입니다. 경고! 이것을 설정하면 여기에 나열되지 않은 모든 크롤러가 비활성화됩니다!" blocked_crawler_user_agents: "사이트 액세스를 허용해서는 안되는 웹 크롤러를 식별하는 사용자 에이전트 문자열에서 대소 문자를 구분하지 않는 고유 한 단어입니다. 허용 목록이 정의 된 경우 적용되지 않습니다." - slow_down_crawler_user_agents: "Crawls-delay 지시문을 사용하여 robots.txt에서 속도를 제한해야하는 웹 크롤러의 사용자 에이전트" slow_down_crawler_rate: "slow_down_crawler_user_agents를 지정하면이 비율이 모든 크롤러에 적용됩니다 (요청 사이의 지연 시간 (초))." content_security_policy: "콘텐츠 보안 정책 사용" content_security_policy_report_only: "콘텐츠 보안 정책 보고서 만 사용" diff --git a/config/locales/server.lt.yml b/config/locales/server.lt.yml index 3a0a04c354..d46e5dfcd9 100644 --- a/config/locales/server.lt.yml +++ b/config/locales/server.lt.yml @@ -755,6 +755,7 @@ lt: others: "Nieko neišsaugota" no_drafts: self: "Jūs neturite juodraščių; pradėkite kurti atsakymą bet kurioje temoje ir jis bus automatiškai išsaugotas kaip naujas juodraštis." + no_log_search_queries: "Paieškos žurnalo užklausos šiuo metu išjungtos (administratorius gali jas įjungti svetainės nustatymuose)." email_settings: pop3_authentication_error: "Iškilo problema dėl pateiktų POP3 prisijungimo duomenų, patikrinkite naudotojo vardą ir slaptažodį ir bandykite dar kartą." imap_no_response_error: "Ryšio su IMAP serveriu metu įvyko klaida. %{message}" @@ -1263,6 +1264,7 @@ lt: errors: invalid_email: "Neteisingas el. pašto adresas." invalid_username: "Nėra vartotojo su tokiu vartotojo vardu." + valid_username: "Yra vartotojas su tokiu vartotojo vardu." invalid_group: "Nėra grupės tokiu pavadinimu." invalid_integer_min_max: "Vertė turi būti nuo %{min} iki %{max}." invalid_integer_min: "Vertė turi būti %{min} arba didesnė." diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index 623ac57646..cd4401f382 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -1388,7 +1388,6 @@ nl: allowed_internal_hosts: "Een lijst van interne hosts die Discourse veilig kan verkennen voor oneboxing en andere doeleinden" allowed_iframes: "Een lijst van 'iframe src'-domeinvoorvoegsels die Discourse veilig kan toestaan in berichten" allowed_crawler_user_agents: "Useragents van webcrawlers die toegang tot de website dienen te hebben. WAARSCHUWING! INSTELLEN HIERVAN BLOKKEERT ALLE CRAWLERS DIE HIER NIET WORDEN VERMELD!" - slow_down_crawler_user_agents: "Useragents van webcrawlers waarvan aanvragen beperkt moeten zijn in robots.txt via de Crawl-delay-instructie" slow_down_crawler_rate: "Als slow_down_crawler_user_agents is opgegeven, is deze beperking op alle crawlers van toepassing (aantal seconden vertraging tussen aanvragen)" content_security_policy: "Content-Security-Policy inschakelen" content_security_policy_report_only: "Content-Security-Policy-Report-Only inschakelen" diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 7856337f7a..a1fd2c245b 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -998,6 +998,7 @@ pl_PL: others: "Brak zakładek." no_drafts: self: "Nie masz żadnych zapisanych wersji roboczych. Zacznij pisać odpowiedź w jakimś temacie, a zostanie ona automatycznie zapisana jako nowa wersja robocza." + no_log_search_queries: "Zapytania dziennika wyszukiwania są obecnie wyłączone (administrator może je włączyć w ustawieniach witryny)." email_settings: pop3_authentication_error: "Wystąpił problem z podanymi poświadczeniami POP3, sprawdź nazwę użytkownika i hasło i spróbuj ponownie." imap_authentication_error: "Wystąpił problem z podanymi poświadczeniami IMAP, sprawdź nazwę użytkownika i hasło i spróbuj ponownie." @@ -1617,7 +1618,6 @@ pl_PL: allowed_iframes: "Lista prefiksów domeny src iframe, które dyskurs może bezpiecznie dopuścić w wpisach" allowed_crawler_user_agents: "Agenci użytkowników dla robotów indeksujących, które powinny mieć dostęp do strony. OSTRZEŻENIE! USTAWIENIE TEGO SPOWODUJE BLOKADE ROBOTÓW, KTÓRE NIE SĄ NA LIŚCIE!" blocked_crawler_user_agents: "Unikalne słowo bez rozróżniania wielkości liter w ciągu znaków, które identyfikują crawlery internetowe, które nie powinny mieć dostępu do witryny. Nie ma zastosowania, jeśli dozwolona lista jest zdefiniowana." - slow_down_crawler_user_agents: "Programy klienckie robotów indeksujących, które powinny mieć ograniczoną szybkość w pliku robots.txt, korzystając z dyrektywy o opóźnieniu indeksowania" slow_down_crawler_rate: "Jeśli określono parametr slow_down_crawler_user_agents, ta stawka będzie obowiązywać dla wszystkich robotów (liczba sekund opóźnienia między żądaniami)" content_security_policy: "Włącz politykę bezpieczeństwa treści" content_security_policy_report_only: "Włącz tylko treść-bezpieczeństwo-zasady-tylko raport" diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index 1444b187e9..4c4e1e7ca7 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -1503,7 +1503,6 @@ pt_BR: allowed_iframes: "Uma lista de prefixos de domínio iframe src que o Discourse pode permitir com segurança em postagens" allowed_crawler_user_agents: "Agentes de usuário(a) de rastreadores da web que devem ter permissão para acessar o site. AVISO! ESTA CONFIGURAÇÃO NEGARÁ ACESSO A TODOS OS RASTREADORES NÃO LISTADOS AQUI!" blocked_crawler_user_agents: "Palavra sem diferenciação de maiúsculas e minúsculas na linha do agente do(a) usuário(a) que identifica os rastreadores da web que não devem ter permissão para acessar o site. Não se aplica se a lista de permissões estiver definida." - slow_down_crawler_user_agents: "Agentes de usuário(a) de rastreadores da web que devem ter taxa limitada em robots.txt usando a diretiva de rastreamento atrasado" slow_down_crawler_rate: "Se slow_down_crawler_user_agents for especificado, essa taxa será aplicada a todos os rastreadores (quantidade de segundos de atraso entre os pedidos)" content_security_policy: "Ativar Content-Security-Policy" content_security_policy_report_only: "Ativar Content-Security-Policy-Report-Only" diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index f4b05b0f16..3ffae43c8e 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -220,6 +220,8 @@ ru: local_login_cannot_be_disabled_if_second_factor_enforced: "Вы не можете отключить локальный вход в систему, если применяется двухфакторная аутентификация. Отключите её перед отключением возможности локального входа." cannot_enable_s3_uploads_when_s3_enabled_globally: "Вы не можете включить загрузку S3, потому что загрузка S3 уже включена глобально, и включение этого уровня сайта может вызвать критические проблемы с загрузками" cors_origins_should_not_have_trailing_slash: "Не следует добавлять завершающую косую черту (/) к источникам кросс-доменных запросов (CORS)." + slow_down_crawler_user_agent_must_be_at_least_3_characters: "Значение «User agent» должно содержать не менее 3 символов для корректного ограничения скорости сканирования." + slow_down_crawler_user_agent_cannot_be_popular_browsers: "Не допускается использование следующих значений: %{values}." conflicting_google_user_id: 'Идентификатор учётной записи Google для этой учётной записи изменился; по соображениям безопасности требуется вмешательство персонала. Пожалуйста, свяжитесь с персоналом и укажите
https://meta.discourse.org/t/76575' onebox: invalid_address: "К сожалению, нам не удалось создать предварительный просмотр этой веб-страницы, потому что сервер \"%{hostname}\" не может быть найден. Вместо предварительного просмотра в вашем сообщении будет отображаться только ссылка. :cry:" @@ -1520,6 +1522,7 @@ ru: tl2_post_edit_time_limit: "Пользователи с уровнем доверия 2 и выше могут изменять своё сообщение в течение указанного здесь количества минут после его публикации. Если значение установлено в 0, то этот период не ограничен." edit_history_visible_to_public: "Разрешить обычным пользователям просматривать историю редактирования сообщений. В противном случае история редактирования будет доступна только персоналу." delete_removed_posts_after: "Сообщения, удалённые автором, будут автоматически удаляться через указанное здесь количество часов. Если значение установлено в 0, то сообщения будут удаляться немедленно." + notify_users_after_responses_deleted_on_flagged_post: "Отправлять уведомление пользователям после удаления темы, в которой они отвечали, поскольку на эту тему поступила жалоба." max_image_width: "Максимальная ширина уменьшенных версий изображений, показываемых в сообщениях" max_image_height: "Максимальная высота уменьшенных версий изображений, показываемых в сообщениях" responsive_post_image_sizes: "Изменять размер превью в лайтбоксе, чтобы использовать экраны с высоким разрешением при указанных соотношениях пикселей. Удалите все значения, если необходимо отключить адаптивный дизайн." @@ -1620,7 +1623,7 @@ ru: allowed_iframes: "Список iframe src, которым Discourse может разрешить встраивание в сообщения." allowed_crawler_user_agents: "Перечень поисковых ботов, которым должен быть разрешён доступ к сайту. ПРЕДУПРЕЖДЕНИЕ! УСТАНОВКА ЭТОГО ПАРАМЕТРА ЗАПРЕТИТ ДОСТУП ВСЕМ ПОИСКОВЫМ БОТАМ, НЕ УКАЗАННЫМ В ПЕРЕЧНЕ!" blocked_crawler_user_agents: "Уникальное нечувствительное к регистру слово в строке User-Agent, идентифицирующее поисковых ботов, которым запрещён доступ к сайту. Не применяется, если определён белый список." - slow_down_crawler_user_agents: "Перечень веб-сканеров, скорость которых должна быть ограничена в файле robots.txt с использованием директивы Crawl-delay" + slow_down_crawler_user_agents: "User agents, скорость работы которых должна быть ограничена в соответствии с настройкой «slow down crawler rate». Каждое значение должно состоять не менее чем из 3 символов." slow_down_crawler_rate: "Если указано значение slow_down_crawler_user_agents (количество секунд между запросами), то это значение будет применяться ко всем веб-сканерам" content_security_policy: "Включить политику безопасности контента (CSP)" content_security_policy_report_only: "Включить только отчёт о политике безопасности контента (CSP)" @@ -1657,6 +1660,7 @@ ru: allow_index_in_robots_txt: "Укажите в файле robots.txt, что этот сайт может быть проиндексирован поисковыми системами. В исключительных случаях вы можете навсегда переопределить файл robots.txt." blocked_email_domains: "Перечень почтовых доменов, разделённых вертикальной чертой, с которых запрещена регистрация учётных записей. Пример: mailinator.com|trashmail.net" allowed_email_domains: "Перечень почтовых доменов, разделённых вертикальной чертой, с которых ДОЛЖНА производиться регистрация учётных записей.\nВНИМАНИЕ: Пользователям других почтовых доменов регистрация будет недоступна!" + normalize_emails: "Проверять нормализованную электронную почту на уникальность. При нормализации из адреса электронной почты удаляются все точки из имени пользователя и символ '+'." auto_approve_email_domains: "Пользователи с адресами электронной почты из этого списка доменов будут автоматически одобрены." hide_email_address_taken: "Не сообщать пользователям во время регистрации и из формы восстановления пароля, что учётная запись с заданным электронным адресом существует." log_out_strict: "Когда пользователь выходит из системы, закрывать все сессии на всех устройствах пользователя." @@ -1846,6 +1850,9 @@ ru: max_mentions_per_post: "Максимальное число упоминаний других пользователей (@name), которое любой пользователь может сделать в одном сообщении." max_users_notified_per_group_mention: "Максимальное количество пользователей, которые могут получать уведомления при упоминании группы (при достижении порогового значения уведомления создаваться не будут)" enable_mentions: "Разрешать пользователям упоминать других пользователей." + here_mention: "Имя, используемое для упоминания в @here. Не должно повторять существующее имя.пользователя." + max_here_mentioned: "Максимальное количество пользователей для упоминания в @here." + min_trust_level_for_here_mention: "Минимальный уровень доверия, при котором допускается использование @here." create_thumbnails: "Создавать миниатюры слишком больших картинок в сообщениях, показывать большие оригиналы картинок в отдельно открывающемся окне." email_time_window_mins: "Подождать указанное здесь количество минут перед отправкой почтовых уведомлений, чтобы дать автору возможность перечитать и отредактировать только что созданное сообщение." personal_email_time_window_seconds: "Подождать указанное здесь количество секунд перед отправкой письма с личным сообщением, чтобы дать автору возможность перечитать и отредактировать только что созданное сообщение." @@ -2183,6 +2190,7 @@ ru: invalid_css_color: "Недопустимый цвет. Введите название цвета или шестнадцатеричное значение." invalid_email: "Неправильный адрес электронной почты." invalid_username: "Пользователя с таким псевдонимом не обнаружено." + valid_username: "Пользователь с таким именем уже существует." invalid_group: "Нет группы с таким названием." invalid_integer_min_max: "Значение должно быть от %{min} до %{max}." invalid_integer_min: "Значение не должно быть меньше %{min}." @@ -2603,6 +2611,21 @@ ru: test_mailer: title: "Отправка тестового письма" subject_template: "[%{email_prefix}] Проверка доставки электронного письма" + text_body_template: | + Это тестовое письмо от + + [**%{base_url}**][0] + + Мы надеемся, что вы получили это тестовое письмо! + + Вот [удобный чек-лист для проверки настроек электронной почты][1]. + + Удачи, + + Ваши друзья с сайта [Discourse](https://www.discourse.org) + + [0]: %{base_url} + [1]: https://meta.discourse.org/t/email-delivery-configuration-checklist/209839 new_version_mailer: title: "Установка обновления" subject_template: "[%{email_prefix}] Доступна новая версия Discourse" @@ -2640,6 +2663,11 @@ ru: inappropriate: "Сообщество считает ваше сообщение **неприемлемым**, т.е. оскорбительным, непристойным или нарушающим [основные принципы сообщества](%{base_path}/guidelines)." spam: "Ваше сообщение расценено как **спам**. Сообщество считает, что ваше сообщение не имеет отношения к теме, не является актуальным и носит рекламный характер." notify_moderators: "Ваше сообщение расценено как **подозрительное**. Сообщество считает, что ваше сообщение **требует отдельного внимания модератора**." + responder: + off_topic: "Ваше сообщение расценено как **оффтоп**. Сообщество считает, что ваше сообщение **не относится к теме**, учитывая заголовок темы и содержание первого сообщения." + inappropriate: "Сообщество считает ваше сообщение **неприемлемым**, т.е. оскорбительным, непристойным или нарушающим [основные принципы сообщества](%{base_path}/guidelines)." + spam: "Ваше сообщение расценено как **спам**. Сообщество считает, что ваше сообщение не имеет отношения к теме, не является актуальным и носит рекламный характер." + notify_moderators: "Ваше сообщение отправлено на **премодерацию**. Сообщество считает, что ваше сообщение требует отдельного внимания модератора." flags_dispositions: agreed: "Спасибо за информацию. Мы согласны, что это проблема, и уже рассматриваем ее." agreed_and_deleted: "Спасибо за информацию - мы согласны с вами и уже удалили сообщение." @@ -2731,6 +2759,23 @@ ru: ``` Пожалуйста, ознакомьтесь с [основными принципами сообщества](%{base_url}/guidelines), чтобы исключить повторения подобных ситуаций в дальнейшем. + flags_agreed_and_post_deleted_for_responders: + title: "Удалён ответ из сообщения, на которое поступила жалоба" + subject_template: "Модератор удалил ответ из сообщения, на которое поступила жалоба" + text_body_template: | + Здравствуйте, + + Это автоматическое сообщение с сайта %{site_name}, уведомляющее о том, что тема [post](%{base_url}%{url}), в которой вы отвечали, была удалена. + + %{flag_reason} + + На эту тему поступила жалоба от сообщества, и модератор решил её удалить. + + ``` markdown + %{flagged_post_raw_content} + ``` + + С причинами, по которым эта темы была удалена, вы можете ознакомиться в разделе [Основные принципы сообщества](%{base_url}/guidelines). usage_tips: text_body_template: | Чтобы получить несколько быстрых советов по началу работы в качестве нового пользователя форума, [ознакомьтесь с этим блогом](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/). diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml index cc5c6ffda7..4ecbf3bd6a 100644 --- a/config/locales/server.sv.yml +++ b/config/locales/server.sv.yml @@ -1494,7 +1494,6 @@ sv: allowed_iframes: "En lista med iframekällors domänprefix som Discourse säkert kan tillåta i inlägg" allowed_crawler_user_agents: "Användaragenter för sökrobotar som ska få åtkomst till webbplatsen. VARNING! INSTÄLLNING AV DETTA FÖRBJUDER ALLA SÖKMOTORER SOM INTE LISTAS HÄR!" blocked_crawler_user_agents: "Unikt fall av känsligt ord i användaragent-strängen som identifierar webbsökare som inte bör få åtkomst till webbplatsen. Gäller inte om vitlista har definierats." - slow_down_crawler_user_agents: "Användaragenter för webbsökare som bör begränsas i robots.txt med hjälp av Crawl-delay-direktivet" slow_down_crawler_rate: "Om slow_down_crawler_user_agents anges kommer denna hastighet att gälla för alla sökrobotar (fördröjning mellan förfrågningarna uttryckt i sekunder)" content_security_policy: "Aktivera säkerhetspolicy för innehåll" content_security_policy_report_only: "Aktivera enbart säkerhetspolicy för innehåll" @@ -1531,6 +1530,7 @@ sv: allow_index_in_robots_txt: "Ange i robots.txt att den här webbplatsen får indexeras av webbsökmotorer. I undantagsfall kan du permanent åsidosätta robots.txt." blocked_email_domains: "En textfil avgränsad med vertikalstreck med alla e-postdomäner som användare inte tillåts registrera konton med. Exempel: mailinator.com|trashmail.net" allowed_email_domains: "En textfil avgränsad med vertikalstreck med alla e-postdomäner som användare MÅSTE registrera konton med. VARNING: Användare med andra e-postdomäner än de som anges kommer inte att tillåtas!" + normalize_emails: "Kontrollera om normaliserad e-post är unik. Normaliserad e-post tar bort alla punkter från användarnamnet och allt mellan symbolerna + och @." auto_approve_email_domains: "Användare med e-postadresser som finns i denna lista av domäner kommer automatiskt att godkännas." hide_email_address_taken: "Informera inte användare om att det finns ett konto med en given e-postadress vid registreringen eller från det glömda lösenordsformuläret." log_out_strict: "Vid utloggning, logga ut ALLA sessioner för den användaren på alla apparater" @@ -1720,6 +1720,9 @@ sv: max_mentions_per_post: "Max antal @namn-aviseringar vem som helst kan göra i ett inlägg." max_users_notified_per_group_mention: "Maximalt antal användare som kan få ett meddelande om en grupp anges (om tröskeln har uppfyllts kommer inga aviseringar att skickas)" enable_mentions: "Tillåt användare att nämna andra användare." + here_mention: "Namn som används för att omnämna genom @namn. Får inte vara ett befintligt användarnamn." + max_here_mentioned: "Maximalt antal omnämnda personer genom @namn." + min_trust_level_for_here_mention: "Lägsta förtroendenivå som krävs för att omnämna genom @namn." create_thumbnails: "Skapa miniatyrer och \"lightboxa\" bilder som är för stora för att passa in i ett inlägg." email_time_window_mins: "Vänta (n) minuter innan e-postaviseringar skickas ut, för att ge användare chansen att redigera och slutföra deras inlägg." personal_email_time_window_seconds: "Vänta (n) sekunder innan en privat e-postavisering skickas ut för att ge användare chansen att redigera och slutföra deras meddelande." @@ -2057,6 +2060,7 @@ sv: invalid_css_color: "Ogiltig färg. Ange ett färgnamn eller ett hexvärde." invalid_email: "Felaktig e-postadress." invalid_username: "Det finns ingen användare med detta användarnamn." + valid_username: "Det finns redan en användare med det användarnamnet." invalid_group: "Det finns ingen grupp med det namnet." invalid_integer_min_max: "Värdet måste vara mellan %{min} och %{max}." invalid_integer_min: "Värdet måste vara %{min} eller större." @@ -2424,6 +2428,21 @@ sv: test_mailer: title: "Test per e-post" subject_template: "[%{email_prefix}] Leveranstest för e-post" + text_body_template: | + Det här är ett testmeddelande från + + [**%{base_url}**][0] + + Vi hoppas att du har fått detta leveranstest av e-post OK! + + Här är en [händig checklista för att verifiera konfigurationen av e-postleverans][1]. + + Lycka till, + + Dina vänner på [Discourse](https://www.discourse.org) + + [0]: %{base_url} + [1]: https://meta.discourse.org/t/email-delivery-configuration-checklist/209839 new_version_mailer: title: "E-post om ny version" subject_template: "[%{email_prefix}] Ny version av Discourse, uppdatering tillgänglig" diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index c001a95b97..e90bd66b32 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -50,7 +50,7 @@ tr_TR: disable_remote_images_download_reason: "Yeterli disk alanı kalmaması sebebiyle uzaktan görüntü indirme devre dışı bırakıldı." anonymous: "Anonim" remove_posts_deleted_by_author: "Yazar tarafından silindi" - redirect_warning: "Seçtiğiniz bağlantının gerçekten foruma gönderildiğini doğrulayamadık. Yine de devam etmek istiyorsanız, aşağıdaki bağlantıyı seçin." + redirect_warning: "Seçtiğiniz bağlantının gerçekten foruma gönderildiğini doğrulayamadık. Yine de devam etmek istiyorsanız aşağıdaki bağlantıyı seçin." on_another_topic: "Başka bir konuda" inline_oneboxer: topic_page_title_post_number: "#%{post_number}" @@ -81,7 +81,7 @@ tr_TR: settings_errors: invalid_yaml: "Sağlanan YAML geçersiz." data_type_not_a_number: "`%{name}` tipinin ayarlanması desteklenmiyor. Desteklenen türler \"integer\", \"bool\", \"list\", \"enum\" ve \"upload\"dur." - name_too_long: "Çok uzun ismi olan bir ayar var. Maksimum uzunluk 255" + name_too_long: "Çok uzun adı olan bir ayar var. Maksimum uzunluk 255" default_value_missing: "`%{name}` ayarının varsayılan değeri yoktur" default_not_match_type: "`%{name}` ayarının varsayılan değerinin türü ayar türüyle eşleşmiyor." default_out_range: "`%{name}` ayarının varsayılan değeri belirtilen aralıkta değil." @@ -104,25 +104,25 @@ tr_TR: maximum_staged_user_per_email_reached: "E-posta başına maksimum sayıda kullanıcıya ulaşıldı." no_subject: "(konu yok)" no_body: "(kimse)" - missing_attachment: "(%{filename} isimli ek kayıp)" + missing_attachment: "(%{filename} adlı ek kayıp)" continuing_old_discussion: one: "Tartışma [%{title}] (%{url}) başlığında devam ediyor, çünkü o başlık %{count} gün önce oluşturulmuş." other: "Tartışma [%{title}] (%{url}) başlığında devam ediyor, çünkü o başlık %{count} gün önce oluşturulmuş." errors: empty_email_error: "Bize ulaşan ham posta boş olduğunda olur." no_message_id_error: "E-postanın 'Message-Id' başlığı olmadığında olur." - auto_generated_email_error: "'Öncelik' başlığı ayarlandığında gerçekleşir: liste, önemsiz, toplu veya cevap, veya başka bir başlık varsa: otomatik gönderilen, otomatik yanıtlanan veya otomatik üretilen." + auto_generated_email_error: "'Öncelik' başlığı şunlara ayarlandığında gerçekleşir: Liste, önemsiz, toplu veya yanıt veya başka bir başlık varsa: Otomatik gönderilen, otomatik yanıtlanan veya otomatik üretilen." no_body_detected_error: "Bir gövdeyi ayıklayamadığımız ve hiçbir ekin olmadığı zaman olur." no_sender_detected_error: "From Header'da geçerli bir e-posta adresi bulamadığımızda olur." - from_reply_by_address_error: "From header'da, e-posta adresiyle cevap eşleştiğinde olur." + from_reply_by_address_error: "Gönderen başlığı, e-posta adresine göre yanıtla eşleştiğinde gerçekleşir." inactive_user_error: "Gönderici etkin olmadığında olur." silenced_user_error: "Gönderen susturulduğunda olur." bad_destination_address: "Kime / CC Alanlarındaki e-posta adreslerinden hiçbiri yapılandırılmış bir gelen e-posta adresiyle eşleşmediğinde olur." strangers_not_allowed_error: "Bir kullanıcı, üye olmadığı bir kategoride yeni bir konu oluşturmaya çalıştığında gerçekleşir." - insufficient_trust_level_error: "Bir kullanıcı, gerekli güven seviyesine sahip olmadığı bir kategoride yeni bir konu oluşturmaya çalıştığında gerçekleşir." + insufficient_trust_level_error: "Bir kullanıcı, gerekli güven düzeyine sahip olmadığı bir kategoride yeni bir konu oluşturmaya çalıştığında gerçekleşir." reply_user_not_matching_error: "Bildirimin gönderildiği farklı bir e-posta adresinden yanıt geldiğinde gerçekleşir." - topic_not_found_error: "Bir cevap geldiğinde gerçekleşir ancak ilgili konu silinir." - topic_closed_error: "Kapanan konuya cevap geldiğinde olur." + topic_not_found_error: "Silinen ilgili konuya yanıt geldiğinde gerçekleşir." + topic_closed_error: "Kapanan ilgili konuya yanıt geldiğinde olur." bounced_email_error: "E-posta geri dönen bir e-posta raporudur." screened_email_error: "Bu olay gönderenin e-posta adresi tarandığında olur." unsubscribe_not_allowed: "Bu kullanıcı için e-posta aboneliği iptal edilmiş." @@ -151,11 +151,11 @@ tr_TR: inclusion: listeye dahil edilmemiş invalid: geçersiz is_invalid: "belirsiz görünüyor, bu tamamlanmış bir cümle mi?" - is_invalid_meaningful: "belirsiz görünüyor, kelimelerin çoğu aynı harfleri tekrar tekrar içeriyor gibi" - is_invalid_unpretentious: "anlaşılmaz görünüyor, bir veya daha fazla kelime çok mu uzun?" + is_invalid_meaningful: "belirsiz görünüyor, sözcüklerin çoğu aynı harfleri tekrar tekrar içeriyor gibi" + is_invalid_unpretentious: "anlaşılmaz görünüyor, bir veya daha fazla sözcük çok mu uzun?" is_invalid_quiet: "anlaşılmaz görünüyor, tümünü BÜYÜK HARF olarak mı girmek istediniz?" invalid_timezone: "'%{tz}' geçerli bir saat dilimi değil" - contains_censored_words: "aşağıdaki sansürlü kelimeleri içerir: %{censored_words}" + contains_censored_words: "aşağıdaki sansürlü sözcükleri içerir: %{censored_words}" less_than: '%{count} rakamından az olmalı' less_than_or_equal_to: '%{count} rakamına eşit veya daha az olmalı' not_a_number: sayı değil @@ -193,17 +193,17 @@ tr_TR: other: "Geçersiz %{name} seçeneklerini belirttiniz" default_categories_already_selected: "Bir başka listede kullanılan bir kategoriyi seçemezsiniz." default_tags_already_selected: "Başka listede kullanılan bir etiketi seçemezsiniz." - s3_upload_bucket_is_required: "Bir 's3_upload_bucket' tanımlamadıysanız, S3 yüklemelerini etkinleştiremezsiniz." - enable_s3_uploads_is_required: "S3 yüklemelerini etkinleştirmediyseniz, envanteri S3'e etkinleştiremezsiniz." - page_publishing_requirements: "Güvenli ortam etkinleştirilirse, sayfa yayınlama etkinleştirilemez." - s3_backup_requires_s3_settings: "'%{setting_name}'ı sağlamadıysanız, S3'ü yedekleme konumu olarak kullanamazsınız." + s3_upload_bucket_is_required: "Bir 's3_upload_bucket' tanımlamadıysanız S3 yüklemelerini etkinleştiremezsiniz." + enable_s3_uploads_is_required: "S3 yüklemelerini etkinleştirmediyseniz envanteri S3'e etkinleştiremezsiniz." + page_publishing_requirements: "Güvenli ortam etkinleştirilirse sayfa yayınlama etkinleştirilemez." + s3_backup_requires_s3_settings: "'%{setting_name} verisini sağlamadıysanız S3'ü yedekleme konumu olarak kullanamazsınız." s3_bucket_reused: "Aynı sepeti 's3_upload_bucket' ve 's3_backup_bucket' için kullanamazsınız. Farklı bir sepet seçin veya her sepet için farklı bir yol kullanın." secure_media_requirements: "Güvenli medyayı etkinleştirmeden önce S3 yüklemelerinin etkinleştirilmesi gerekir." share_quote_facebook_requirements: "Facebook paylaşımını etkinleştirmek için bir Facebook uygulaması kimliği ayarlamanız gerekir." second_factor_cannot_enforce_with_socials: "Sosyal oturum açma etkinken 2FA'yı zorunlu kılamazsınız. Önce şu yollarla oturum açmayı devre dışı bırakmalısınız: %{auth_provider_names}" second_factor_cannot_be_enforced_with_disabled_local_login: "Yerel girişler devre dışı bırakılmışsa 2FA'yı uygulayamazsınız." second_factor_cannot_be_enforced_with_discourse_connect_enabled: "DiscourseConnect etkinse 2FA'yı zorlayamazsınız." - local_login_cannot_be_disabled_if_second_factor_enforced: "2FA zorunluysa, yerel girişi devre dışı bırakamazsınız. Yerel girişleri devre dışı bırakmadan önce zorunlu 2FA'yı devre dışı bırakın." + local_login_cannot_be_disabled_if_second_factor_enforced: "2FA zorunluysa yerel girişi devre dışı bırakamazsınız. Yerel girişleri devre dışı bırakmadan önce zorunlu 2FA'yı devre dışı bırakın." cannot_enable_s3_uploads_when_s3_enabled_globally: "S3 yüklemeleri zaten küresel olarak etkin olduğundan S3 yüklemelerini etkinleştiremezsiniz ve bu site düzeyini etkinleştirmek yüklemelerde kritik sorunlara neden olabilir" cors_origins_should_not_have_trailing_slash: "CORS kaynaklarına sondaki eğik çizgiyi (/) eklememelisiniz." conflicting_google_user_id: 'Bu hesap için Google Hesap Kimliği değişti; Güvenlik nedeniyle yetkili müdahalesi gerekmektedir. Lütfen yetkili ile iletişime geçin ve
https://meta.discourse.org/t/76575' @@ -234,7 +234,7 @@ tr_TR: rate_limit: one: "Son bir gün içinde zaten %{count} davetiye gönderdiniz, lütfen tekrar denemeden önce %{time_left} bekleyin." other: "Son bir gün içinde zaten %{count} davetiye gönderdiniz, lütfen tekrar denemeden önce %{time_left} bekleyin." - confirm_email: "

Neredeyse bitti! E-posta adresinize bir aktivasyon postası gönderdik. Lütfen hesabınızı etkinleştirmek için postadaki talimatları izleyin.

Gelmezse, spam klasörünüzü kontrol edin.

" + confirm_email: "

Neredeyse bitti! E-posta adresinize bir etkinleştirme postası gönderdik. Lütfen hesabınızı etkinleştirmek için postadaki talimatları izleyin.

Gelmezse istenmeyen posta klasörünüzü kontrol edin.

" cant_invite_to_group: "Kullanıcıları belirtilen gruba (gruplara) davet etme yetkiniz yok. Davet etmeye çalıştığınız grubun (grupların) sahibi olduğunuzdan emin olun." disabled_errors: discourse_connect_enabled: "DiscourseConnect etkinleştirildiğinden davetler devre dışı bırakıldı." @@ -245,7 +245,7 @@ tr_TR: max_rows: "İlk olarak %{max_bulk_invites} davetiyeleri gönderildi. Dosyayı daha küçük parçalara bölmeyi deneyin." error: "Bu dosya yüklenirken bir hata oluştu. Lütfen daha sonra tekrar deneyiniz." invite_link: - email_taken: "Bu e-posta zaten kullanımda. Bir hesabınız varsa, lütfen giriş yapın veya parolanızı sıfırlayın." + email_taken: "Bu e-posta zaten kullanımda. Bir hesabınız varsa lütfen giriş yapın veya parolanızı sıfırlayın." max_redemptions_limit: "2 ile %{max_limit} arasında olmalıdır." topic_invite: failed_to_invite: "Kullanıcı, aşağıdaki gruplardan birinde grup üyeliği olmadan bu konuya davet edilemez: %{group_names}." @@ -283,11 +283,11 @@ tr_TR: reading_time: "Okuma Zamanı" likes: "Beğeniler" too_many_replies: - one: "Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} cevap ile sınırlılar." - other: "Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} cevap ile sınırlılar." + one: "Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} yanıt ile sınırlılar." + other: "Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} yanıt ile sınırlılar." max_consecutive_replies: - one: "Ardışık cevap yok. Lütfen önceki cevabınızı düzenleyin veya birisinin size cevap vermesini bekleyin." - other: "En fazla %{count} ardışık cevaplara izin verilmez. Lütfen önceki cevabınızı düzenleyin veya birisinin size cevap vermesini bekleyin." + one: "Ardışık yanıt yok. Lütfen önceki yanıtınızı düzenleyin veya birisinin sizi yanıtlamasını bekleyin." + other: "%{count} taneden fazla ardışık yanıta izin verilmez. Lütfen önceki yanıtızı düzenleyin veya birisinin sizi yanıtlamasını bekleyin." embed: start_discussion: "Tartışma Başlat" continue: "Tartışmaya Devam Et" @@ -298,19 +298,19 @@ tr_TR: no_hosts: "Gömmek için hiçbir ana bilgisayar ayarlanmadı." configure: "Gömmeyi Yapılandır" more_replies: - one: "%{count} cevap daha" - other: "%{count} cevap daha" + one: "%{count} yanıt daha" + other: "%{count} yanıt daha" loading: "Tartışma Yükleniyor..." permalink: "Kalıcı Bağlantı" imported_from: "Bu ilave bir tartışmadır, asıl konu adresi %{link}" in_reply_to: "▶ %{username}" replies: - one: "%{count} cevap" - other: "%{count} cevap" + one: "%{count} yanıt" + other: "%{count} yanıt" likes: one: "%{count} beğeni" other: "%{count} beğeni" - last_reply: "Son cevap" + last_reply: "Son yanıt" created: "Oluşturuldu" new_topic: "Yeni konu oluştur" no_mentions_allowed: "Üzgünüz, diğer kullanıcılardan bahsedemezsiniz." @@ -335,8 +335,8 @@ tr_TR: too_many_links: one: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} bağlantı ekleyebilirler." other: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} bağlantı ekleyebilirler." - contains_blocked_word: "Gönderiniz izin verilmeyen bir kelime içeriyor: %{word}" - contains_blocked_words: "Gönderiniz izin verilmeyen birden çok kelime içeriyor: %{words}" + contains_blocked_word: "Gönderiniz izin verilmeyen bir sözcük içeriyor: %{word}" + contains_blocked_words: "Gönderiniz izin verilmeyen birden çok sözcük içeriyor: %{words}" spamming_host: "Üzgünüz bu sunucuya bağlantı veremezsiniz." user_is_suspended: "Uzaklaştırılmış kullanıcılar gönderi yapamazlar." topic_not_found: "Bir şeyler ters gitti. Muhtemelen siz konuya bakarken bu konu kapatıldı ya da silindi." @@ -391,7 +391,7 @@ tr_TR: bookmarks: errors: already_bookmarked_post: "Aynı gönderiyi iki kez işaretleyemezsiniz." - too_many: "Maalesef %{limit} adetten fazla yer işareti ekleyemezsiniz, var olanlardan bazılarını kaldırmak için %{user_bookmarks_url} adresiniz ziyaret edin." + too_many: "Maalesef %{limit} adetten fazla yer işareti ekleyemezsiniz; var olanlardan bazılarını kaldırmak için %{user_bookmarks_url} adresini ziyaret edin." cannot_set_past_reminder: "Geçmişte bir yer imi anımsatıcısı ayarlayamazsınız." cannot_set_reminder_in_distant_future: "10 yıldan uzun bir gelecek için bir yer imi hatırlatıcısı ayarlayamazsınız." time_must_be_provided: "tüm hatırlatıcılar için zaman belirtilmelidir" @@ -432,11 +432,11 @@ tr_TR: admins: "yöneticiler" moderators: "moderatörler" staff: "görevli" - trust_level_0: "güven_seviyesi_0" - trust_level_1: "güven_seviyesi_1" - trust_level_2: "güven_seviyesi_2" - trust_level_3: "güven_seviyesi_3" - trust_level_4: "güven_seviyesi_4" + trust_level_0: "güven_düzeyi_0" + trust_level_1: "güven_düzeyi_1" + trust_level_2: "güven_düzeyi_2" + trust_level_3: "güven_düzeyi_3" + trust_level_4: "güven_düzeyi_4" request_membership_pm: title: "@ %{group_name} için üyelik talebi" request_accepted_pm: @@ -452,9 +452,9 @@ tr_TR: - Yüksek sesle okuduğunuzda başlık ilgi çekici geliyor mu? İyi bir özet mi? - - Bununla kim ilgilenir? Neden önemli? Ne gibi cevaplar almayı diliyorsunuz? + - Bununla kim ilgilenir? Neden önemli? Ne gibi yanıtlar almayı diliyorsunuz? - - Diğerlerinin de kolayca *bulabilmesi* için konunuza sıkça kullanılan kelimeler ekleyin. Konunuzun benzer konularla gruplanması için bir kategori (ya da etiket) seçin. + - Diğerlerinin de kolayca *bulabilmesi* için konunuza sıkça kullanılan sözcükler ekleyin. Konunuzun benzer konularla gruplanması için bir kategori (ya da etiket) seçin. Daha fazlası için, [topluluk yönergelerimize bakın](%{base_path}/guidelines). Bu panel sadece ilk %{education_posts_text} için görünür. "new-reply": | @@ -462,9 +462,9 @@ tr_TR: - Topluluğun diğer üyelerine karşı nazik olun. - - Cevabınız sohbeti bir şekilde geliştiriyor mu? + - Yanıtınız sohbeti bir şekilde geliştiriyor mu? - - Yapıcı eleştiri her zaman kabul edilir, ama *fikirleri* eleştirin, insanları değil. + - Yapıcı eleştiri her zaman kabul edilir, ama *fikirleri* eleştirin, kişileri değil. Daha fazlası için, [topluluk yönergelerimize bakın](%{base_path}/guidelines). Bu yazı sadece ilk %{education_posts_text} için görünür. avatar: | @@ -479,17 +479,17 @@ tr_TR: dominating_topic: Birden fazla gönderdiniz %{percent}Burada cevapların% else orada herkesin duymak isteriz edilir? get_a_room: '@%{reply_username} %{count} kez yanıt verdiniz, bunun yerine ona kişisel bir mesaj gönderebileceğinizi biliyor muydunuz?' too_many_replies: | - ### Bu konu için cevap limitinizi doldurdunuz + ### Bu konu için yanıt limitinizi doldurdunuz - Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde en fazla %{newuser_max_replies_per_topic} cevap ile sınırlıdır. + Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde en fazla %{newuser_max_replies_per_topic} yanıt ile sınırlıdır. - Yeni bir cevap girmek yerine, önceki cevaplarınızı düzenlediğinizden emin olun veya diğer konuları ziyaret edin. + Yeni bir yanıt girmek yerine, önceki yanıtlarınızı düzenlediğinizden emin olun veya diğer konuları ziyaret edin. reviving_old_topic: | - ### Bu konuyu canlandırmak ister misiniz? + ### Bu konuyu canlandırmak istiyor musunuz? - Bu konuya en son yanıt **%{time_ago}** önceydi. Cevabınız, bu konuyu listesinin en üstüne taşıyacak ve geçmişte sohbete katılmış olan herkese bildirim gönderecek. + Bu konuya en son yanıt **%{time_ago}** önceydi. Yanıtınız, bu konuyu listesinin en üstüne taşıyacak ve geçmişte sohbete katılmış olan herkese bildirim gönderecek. - Bu eski konuşmaya devam etmek istediğine emin misin? + Bu eski konuşmayı sürdürmek istediğine emin misiniz? activerecord: attributes: category: @@ -547,7 +547,7 @@ tr_TR: invalid: "geçerli bir renk değil" post_reply: base: - different_topic: "Gönderi ve cevap aynı konuya ait olmak zorunda." + different_topic: "Gönderi ve yanıt aynı konuya ait olmak zorunda." web_hook: attributes: payload_url: @@ -570,13 +570,13 @@ tr_TR: watched_word: attributes: word: - too_many: "Bu işlem için çok fazla kelime var" + too_many: "Bu işlem için çok fazla sözcük var" base: invalid_url: "Yeni URL geçersiz" <<: *errors uncategorized_category_name: "Kategorize" vip_category_name: "Lobi" - vip_category_description: "Güven seviyesi 3 ve üzerinde olan üyelere özel kategori." + vip_category_description: "Güven düzeyi 3 ve üzerinde olan üyelere özel kategori." meta_category_name: "Site geri bildirimi" meta_category_description: "Bu site, sitenin organizasyonu, nasıl çalıştığı ve nasıl geliştirilebileceği ile ilgili tartışma alanı." staff_category_name: "Görevliler" @@ -603,21 +603,21 @@ tr_TR: Tebrikler! :confetti_ball: - Bu konuyu görebiliyorsanız, yakın süre önce **müdavim** (güven seviyesi 3) seviyesine terfi etmişsiniz demektir. + Bu konuyu görebiliyorsanız yakın bir zaman önce **müdavim** (3. güven düzeyi) düzeyine terfi etmişsiniz demektir. - Şuandan sonra … + Bu andan sonra … * Herhangi bir konunun başlık bilgisini düzenleyebilirsiniz * Herhangi bir konunun kategorisini değiştirebilirsiniz - * Eklediğiniz linkler takip edilebilir durumunda olacaktır ([otomatik nofollow] (http://en.wikipedia.org/wiki/Nofollow) kaldırıldı) - * Sadece 3. güven seviyesi ve üzerindekilere gözüken özel lobi kategorisine erişebilirsiniz + * Eklediğiniz bağlantılar takip edilebilir durumunda olacaktır ([otomatik nofollow] (http://en.wikipedia.org/wiki/Nofollow) kaldırıldı) + * Sadece 3. güven düzeyi ve üzerindekilere gözüken özel lobi kategorisine erişebilirsiniz * Tek bildirmeyle istenmeyen içerikli iletileri gizleyebilirsiniz - [Şu anki müdavim seviyedeki kişilerin listesi](%{base_path}/badges/3/regular). Merhaba demeyi unutmayın. + [Şu anda müdavim düzeyinde bulunan kişilere](%{base_path}/badges/3/regular) bir merhaba demeyi unutmayın. Bu topluluğun önemli bir parçası olduğunuz için teşekkür ederiz! - (Güven seviyeleriyle ilgili daha fazla bilgi için, [bu konuya bakın][trust]. Lütfen, sadece sürekli olarak kriterlere uyan üyelerin standart seviyede kalacağını unutmayın.) + (Güven düzeyleriyle ilgili daha fazla bilgi için [bu konuya bakın][trust]. Lütfen, yalnızca sürekli olarak kriterlere uyan üyelerin standart düzeyde kalacağını unutmayın.) [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924 admin_quick_start_title: "İLK ÖNCE BURAYI OKUYUN: Yönetici Hızlı Başlangıç Kılavuzu" @@ -630,7 +630,7 @@ tr_TR: uncategorized_parent: "Kategorisizin üst kategorisi olamaz" self_parent: "Alt kategorinin üst kategorisi kendisi olamaz" depth: "Bir alt kategori başka bir alt kategorinin altında yer alamaz" - invalid_email_in: "Bu '%{email}' geçerli bir e-posta değil." + invalid_email_in: "'%{email}' geçerli bir e-posta değil." email_already_used_in_group: "'%{email}' zaten '%{group_name}' grubu tarafından kullanılıyor." email_already_used_in_category: "'%{email}' zaten '%{category_name}' kategorisi tarafından kullanılıyor." description_incomplete: "Kategorinin açıklama yazısı en az bir paragrafa sahip olmalıdır." @@ -648,10 +648,11 @@ tr_TR: trust_levels: admin: "Yönetici" staff: "Görevli" - change_failed_explanation: "%{user_name} adlı kullanıcıyı '%{new_trust_level}' seviyesine düşürmeye çalıştınız. Ancak, halihazırda kullanıcının güven seviyesi zaten '%{current_trust_level}'. %{user_name} '%{current_trust_level}' seviyesinde kalacak - eğer seviyesini düşürmek istiyorsanız öncelikle güven seviyesini kilitlemelisiniz" + change_failed_explanation: "%{user_name} adlı kullanıcıyı '%{new_trust_level}' düzeyine düşürmeye çalıştınız. Ancak, halihazırda kullanıcının güven düzeyi zaten '%{current_trust_level}'. %{user_name} '%{current_trust_level}' düzeyinde kalacak - eğer düzeyini düşürmek istiyorsanız öncelikle güven düzeyini kilitlemelisiniz" post: image_placeholder: broken: "Bu görüntü bozuldu" + hidden_bidi_character: "Çift yönlü karakterler, metnin oluşturulma sırasını değiştirebilir. Bu, kötü amaçlı kodu gizlemek için kullanılabilir." has_likes: one: "%{count} Beğeni" other: "%{count} Beğeni" @@ -670,7 +671,7 @@ tr_TR: public_group_membership: "Gruplara çok sık katılıyor ve ayrılıyorsunuz. Lütfen tekrar denemeden önce %{time_left} bekleyin." topics_per_day: "Günlük izin verilen maksimum yeni konu sayısına ulaştınız. %{time_left} sonra daha fazla yeni konu oluşturabilirsiniz." pms_per_day: "Günlük izin verilen maksimum gönderi sayısına ulaştınız. %{time_left} sonra daha fazla yeni gönderi oluşturabilirsiniz." - create_like: "Vaaay! Epey beğeni dağıttınız! Bugün için maksimum günlük beğeni sayısına ulaştınız, ancak güven seviyeleri kazandıkça daha fazla günlük beğeni kullanabileceksiniz. %{time_left} sonra tekrar beğeni verebileceksiniz." + create_like: "Vaaay! Epey beğeni dağıttınız! Bugün için maksimum günlük beğeni sayısına ulaştınız, ancak güven düzeyleri kazandıkça daha fazla günlük beğeni kullanabileceksiniz. %{time_left} sonra tekrar beğeni verebileceksiniz." create_bookmark: "Maksimum günlük yer işareti sayısına ulaştınız. %{time_left} sonra daha fazla yer imi oluşturabilirsiniz." edit_post: "Maksimum günlük düzenleme sayısına ulaştınız. %{time_left} sonra daha fazla düzenleme yapabilirsiniz." live_post_counts: "Çok hızlı bir şekilde canlı yayın sayımı istiyorsunuz. Lütfen tekrar denemeden önce %{time_left} bekleyin." @@ -828,7 +829,7 @@ tr_TR: continue_button: "%{site_name} adresine devam edin" welcome_to: "%{site_name} topluluğuna hoş geldiniz!" approval_required: "Bu foruma erişebilmeniz için yeni hesabınızın bir moderatör tarafından manuel olarak onaylanması gerekir. Hesabınız onaylandığında e-posta ile bilgilendirileceksiniz!" - missing_session: "Hesabınızı tespit edemiyoruz eğer önceden hesap oluşturduysanız, lütfen çerezlerin etkin olduğundan emin olun." + missing_session: "Hesabınızı tespit edemiyoruz; eğer önceden hesap oluşturduysanız lütfen çerezlerin etkin olduğundan emin olun." activated: "Üzgünüz, bu hesap zaten aktif." admin_confirm: title: "Yönetici Hesabını Onayla" @@ -887,7 +888,8 @@ tr_TR: search: "Bu arama koşullarıyla bir yer işareti bulunamadı." others: "Yer imi yok." no_drafts: - self: "Taslağın yok; Herhangi bir konuda cevap yazmaya başladığınızda otomatik olarak yeni taslak olarak kaydedilecek." + self: "Taslak yok; herhangi bir konuyu yanıtlamaya başladığınızda otomatik olarak yeni bir taslak olarak kaydedilecek." + no_log_search_queries: "Arama günlüğü sorguları şu anda devre dışı bırakılmıştır (bir yönetici bunları site ayarlarında etkinleştirebilir)." email_settings: pop3_authentication_error: "Sağlanan POP3 kimlik bilgileriyle ilgili bir sorun oluştu, kullanıcı adını ve şifreyi kontrol edip tekrar deneyin." imap_authentication_error: "Sağlanan IMAP kimlik bilgileriyle ilgili bir sorun oluştu, kullanıcı adını ve şifreyi kontrol edip tekrar deneyin." @@ -987,7 +989,7 @@ tr_TR: confirm_title: '%{site_name} devam et' logging_in_as: '%{username} olarak oturum açılıyor' confirm_button: Giriş yapmayı bitir - no_trust_level: "Üzgünüz, kullanıcı APIsine erişmek için gerekli güvenilirlik seviyeniz yok" + no_trust_level: "Üzgünüz, kullanıcı API'sine erişmek için gerekli güven düzeyiniz yok" generic_error: "Maalesef, kullanıcı API anahtarları veremiyoruz, bu özellik site yöneticisi tarafından devre dışı bırakılmış olabilir" scopes: message_bus: "Anlık güncellemeler" @@ -1131,12 +1133,12 @@ tr_TR: yaxis: "Yeni imlenenlerin sayısı" description: "Yer işareti konmuş yeni konu ve gönderi sayısı." users_by_trust_level: - title: "Güven Seviyesine ait Kullanıcı Sayısı" - xaxis: "Güven Seviyesi" + title: "Güven Düzeyine ait Kullanıcı Sayısı" + xaxis: "Güven Düzeyi" yaxis: "Kullanıcı Sayısı" labels: - level: Seviye - description: "Güven seviyesine göre gruplandırılmış kullanıcı sayısı." + level: Düzey + description: "Güven düzeyine göre gruplandırılmış kullanıcı sayısı." description_link: "https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/" users_by_type: title: "Tür başına kullanıcılar" @@ -1353,11 +1355,11 @@ tr_TR: force_https_warning: "Web siteniz SSL kullanıyor. Ancak site ayarlarınızda ` force_https` henüz etkin değil." out_of_date_themes: "Aşağıdaki temalar için güncellemeler mevcuttur:" unreachable_themes: "Aşağıdaki temalar için güncellemeleri kontrol edemedik:" - watched_word_regexp_error: "İzlenen %{action} kelimeler için normal ifadeye geçersiz, Lütfen İzlenen Kelime ayarlarınızı kontrol edin veya 'izlenen kelimeler normal ifadeler' site ayarını devre dışı bırakın." + watched_word_regexp_error: "İzlenen %{action} sözcükleri için düzenli ifade geçersiz. Lütfen İzlenen Sözcük ayarlarınızı kontrol edin veya 'izlenen sözcük düzenli ifadeleri' site ayarını devre dışı bırakın." site_settings: disabled: "devredışı" display_local_time_in_user_card: "Kullanıcı kartı açıkken yerel saati kullanıcının saat dilimine göre görüntüle." - censored_words: "kelime yerine otomatik olarak ■■■■ kullanılacak kelimeler" + censored_words: "otomatik olarak ■■■■ ile değiştirilecek sözcükler" delete_old_hidden_posts: "30 günden fazla süreyle gizli kalan gizlenmiş gönderileri otomatik olarak sil." default_locale: "Bu Söylem örneğinin varsayılan dili. Özelleştir / Metinile sistem tarafından oluşturulan kategorilerin ve konuların metnini değiştirebilirsiniz." allow_user_locale: "Kullanıcıların arayüz için kendi istedikleri dili seçmesine izin ver" @@ -1374,9 +1376,9 @@ tr_TR: max_topic_title_length: "Konu başlığında izin verilen en fazla karakter sayısı" min_personal_message_title_length: "İleti başlıkları için izin verilen en az karakter sayısı" max_emojis_in_title: "Konu başlığında izin verilen maksimum emoji" - min_search_term_length: "Arama için girilecek kelimede olması gereken en az karakter sayısı" + min_search_term_length: "Arama için girilecek sözcükte olması gereken en az karakter sayısı" search_tokenize_chinese_japanese_korean: "CJK olmayan siteler dahil, -Çince/Japonca/Korece için aramayı bilgileri sıfırlamaya zorla" - search_prefer_recent_posts: "Eğer büyük forumunuzda arama yavaş ise, bu seçenek daha yeni gönderilerin dizine eklenmesini deneyecek" + search_prefer_recent_posts: "Eğer büyük forumunuzda arama yavaş ise bu seçenek daha yeni gönderilerin dizine eklenmesini deneyecek" search_recent_posts_size: "Kaç tane son gönderi dizinde tutulacak" log_search_queries: "Kullanıcılar tarafından gerçekleştirilen günlük arama sorguları" search_query_log_max_size: "Saklanacak maksimum arama sorgusu miktarı" @@ -1389,7 +1391,7 @@ tr_TR: allow_duplicate_topic_titles_category: "Farklı kategorilerde aynı başlıkla konu açılmasına izin ver. allow_duplicate_topic_titles devre dışı bırakılmalıdır." unique_posts_mins: "Kullanıcının aynı içerikle yeni bir gönderi oluşturmadan önce geçmesi gereken dakika" educate_until_posts: "Kullanıcılar, ilk (n) gönderilerini yazmaya başladıklarında, pop-up yeni kullanıcı eğitim paneli metin düzenleyecisinin üstünde çıksın." - title: "Sayfa başlığı etiketinde kullanılacak, bu sitenin ismi." + title: "Sayfa başlığı etiketinde kullanıldığı biçimiyle bu sitenin adı." site_description: "Meta açıklama etiketinde kullanılacak, bu sitenin bir cümlelik açıklaması." short_site_description: "Ana sayfadaki başlık etiketinde kullanılan kısa açıklama." contact_email: "Bu site için yöneticini e-posta adresi. /about iletişim formu içerisinde, sadece acil durumlar ve kritik bildirimler için kullanılacak." @@ -1405,14 +1407,15 @@ tr_TR: post_edit_time_limit: "Bir gd0 veya gd1 yazarı, yayınladıktan sonra (n) dakika boyunca yayınlarını düzenleyebilir. Sonsuza dek 0 olarak ayarlayın." tl2_post_edit_time_limit: "Bir gd2 + yazarı, yayınladıktan sonra (n) dakika boyunca yayınlarını düzenleyebilir. Sonsuza dek 0 olarak ayarlayın." edit_history_visible_to_public: "Düzenlenmiş gönderinin eski sürümlerini herkesin görmesine izin ver. Bu özellik kapatıldığında, eski versiyonları sadece görevliler görebilir." - delete_removed_posts_after: "Yazar tarafından kaldırılan gönderiler (n) saat sonra otomatik olarak silinecektir. 0 olarak ayarlanırsa, gönderiler beklemeden hemen silinir." + delete_removed_posts_after: "Yazar tarafından kaldırılan gönderiler (n) saat sonra otomatik olarak silinecektir. 0 olarak ayarlanırsa gönderiler beklemeden hemen silinir." + notify_users_after_responses_deleted_on_flagged_post: "Bir gönderi bayraklanıp kaldırıldığında, gönderiye yanıt veren ve yanıtlarını kaldıran tüm kullanıcılara bildirilir." max_image_width: "Bir gönderideki küçük resimlerin en fazla genişliği" max_image_height: "Bir gönderideki küçük resimlerin en fazla yüksekliği" responsive_post_image_sizes: "Aşağıdaki piksel oranlarının yüksek DPI ekranlarına izin vermek için ışık kutusu önizleme resimlerini yeniden boyutlandırın. Duyarlı görüntüleri devre dışı bırakmak için tüm değerleri kaldırın." - fixed_category_positions: "Seçerseniz, kategoriler için sabit bir sıralama belirleyebileceksiniz. Seçmezseniz, kategoriler etkinlik sırasına göre listelenir." - fixed_category_positions_on_create: "Seçerseniz, konu oluşturma ekranında da kategori sıralaması korunur (fixed_category_positions gerektirir)." - add_rel_nofollow_to_user_content: 'İç bağlantılar (ana alan adları dahil) hariç, gönderilen tüm kullanıcı içeriklerine rel nofollow ekle. Bu ayarı değiştirirseniz, tüm gönderileri "rake post:rebake" ile yeniden işlemeniz gerekir.' - exclude_rel_nofollow_domains: "nofollow eklenmeyecek sınırlandırılmış alan adları listesi. ust.ornek.com'a izin verirseniz otomatik olarak alt.ornek.com'a da izin verilir. Web tarayıcılarının tüm içeriği bulmasına yardımcı olmak için bu sitenin alan adını en azından eklemelisiniz. Web sitenizin diğer bölümleri başka alan adlarındaysa, bunları da ekleyin." + fixed_category_positions: "Seçerseniz kategoriler için sabit bir sıralama belirleyebileceksiniz. Seçmezseniz kategoriler etkinlik sırasına göre listelenir." + fixed_category_positions_on_create: "Seçerseniz konu oluşturma ekranında da kategori sıralaması korunur (fixed_category_positions gerektirir)." + add_rel_nofollow_to_user_content: 'İç bağlantılar (ana alan adları dahil) hariç, gönderilen tüm kullanıcı içeriklerine rel nofollow ekle. Bu ayarı değiştirirseniz tüm gönderileri "rake post:rebake" ile yeniden işlemeniz gerekir.' + exclude_rel_nofollow_domains: "nofollow eklenmeyecek sınırlandırılmış alan adları listesi. ust.ornek.com'a izin verirseniz otomatik olarak alt.ornek.com'a da izin verilir. Web tarayıcılarının tüm içeriği bulmasına yardımcı olmak için bu sitenin alan adını en azından eklemelisiniz. Web sitenizin diğer bölümleri başka alan adlarındaysa bunları da ekleyin." post_excerpt_maxlength: "Gönderi alıntısının / özetinin en fazla uzunluğu." topic_excerpt_maxlength: "Bir konudaki ilk gönderiden oluşturulan bir konu alıntısının / özetinin maksimum uzunluğu." show_pinned_excerpt_mobile: "Mobil görünümünde başa tutturulmuş konuların özetini göster." @@ -1424,20 +1427,20 @@ tr_TR: force_custom_user_agent_hosts: "Tüm isteklerde özel onebox kullanıcı aracısını kullanacak ana makineler. (Özellikle kullanıcı aracısıyla erişimi sınırlayan ana bilgisayarlar için kullanışlıdır)." max_oneboxes_per_post: "Gönderide olabilecek en fazla kutulama sayısı" facebook_app_access_token: "Facebook uygulama kimliğinizden ve gizli dizenizden bir token oluşturuldu. Instagram onebox'larını oluşturmak için kullanılır." - logo: "Sitenizin sol üst tarafındaki logo resmi. Yüksekliği 120 ve en boy oranı 3: 1 den büyük olan geniş dikdörtgen bir görüntü kullanın. Boş bırakılırsa, site başlığı metni gösterilir." - logo_small: "Aşağı kaydırırken sitenizin sol üst köşesinde görülen küçük logo resmi. 120 × 120 kare bir görüntü kullanın. Boş bırakılırsa, bir ev glifi gösterilir." - digest_logo: "Sitenizin e-posta özetinin en üstünde kullanılan alternatif logo resmi. Geniş bir dikdörtgen görüntü kullanın. SVG görüntüsü kullanmayın. Boş bırakılırsa, “logo” ayarındaki görüntü kullanılır." - mobile_logo: "Sitenizin mobil sürümünde kullanılan logo. Yüksekliği 120 ve en boy oranı 3: 1 den büyük olan geniş dikdörtgen bir görüntü kullanın. Boş bırakılırsa, “logo” ayarındaki görüntü kullanılır." + logo: "Sitenizin sol üst tarafındaki logo resmi. Yüksekliği 120 ve en boy oranı 3: 1 den büyük olan geniş dikdörtgen bir görüntü kullanın. Boş bırakılırsa site başlığı metni gösterilir." + logo_small: "Aşağı kaydırırken sitenizin sol üst köşesinde görülen küçük logo resmi. 120 × 120 kare bir görüntü kullanın. Boş bırakılırsa bir ev glifi gösterilir." + digest_logo: "Sitenizin e-posta özetinin en üstünde kullanılan alternatif logo resmi. Geniş bir dikdörtgen görüntü kullanın. SVG görüntüsü kullanmayın. Boş bırakılırsa “logo” ayarındaki görüntü kullanılır." + mobile_logo: "Sitenizin mobil sürümünde kullanılan logo. Yüksekliği 120 ve en boy oranı 3: 1 den büyük olan geniş dikdörtgen bir görüntü kullanın. Boş bırakılırsa “logo” ayarındaki görüntü kullanılır." logo_dark: "'Logo' ayarı için koyu şema alternatifi." logo_small_dark: "'Logo küçük' ayarı için koyu şema alternatifi." mobile_logo_dark: "'Mobil logo' ayarı için koyu şema alternatifi." large_icon: "Diğer meta veri simgeleri için temel olarak kullanılan resim. İdeal olarak 512 x 512 den büyük olmalıdır. Boş bırakılırsa logo_small kullanılacaktır." - manifest_icon: "Android de logo/splash görüntüsü olarak kullanılan resim. Otomatik şekilde 512 × 512 olarak yeniden boyutlandırılır. Boş bırakılırsa, large_icon kullanılır." + manifest_icon: "Android de logo/splash görüntüsü olarak kullanılan resim. Otomatik şekilde 512 × 512 olarak yeniden boyutlandırılır. Boş bırakılırsa large_icon kullanılır." manifest_screenshots: "Uygulama yükleme (PWA) sayfasında örnek özelliklerinizi ve işlevselliğinizi gösteren ekran görüntüleri. Tüm resimler yerel yüklemeler olmalı ve aynı boyutlarda olmalıdır." - favicon: "Siteniz için bir simge, bkz. Https://en.wikipedia.org/wiki/Favicon . Bir CDN üzerinde düzgün çalışmak için bir png olması gerekir. 32x32 olarak yeniden boyutlandırılacak. Boş bırakılırsa, large_icon kullanılır." - apple_touch_icon: "Apple dokunmatik cihazlar için kullanılan simge. Otomatik olarak 180x180 boyutuna getirilecek. Boş bırakılırsa, large_icon kullanılır." - opengraph_image: "Sayfada başka uygun görüntü yoksa varsayılan açık grafik görüntüsü. Boş bırakılırsa, large_icon kullanılır" - twitter_summary_large_image: "Twitter kartı 'özet büyük resim' (en az 280 genişliğinde ve en az 150 yüksekliğinde olmalıdır). Boş bırakılırsa, opengraph_image kullanılarak normal kart meta verileri oluşturulur." + favicon: "Siteniz için bir simge, bkz. Https://en.wikipedia.org/wiki/Favicon . Bir CDN üzerinde düzgün çalışmak için bir png olması gerekir. 32x32 olarak yeniden boyutlandırılacak. Boş bırakılırsa large_icon kullanılır." + apple_touch_icon: "Apple dokunmatik cihazlar için kullanılan simge. Otomatik olarak 180x180 boyutuna getirilecek. Boş bırakılırsa large_icon kullanılır." + opengraph_image: "Sayfada başka uygun görüntü yoksa varsayılan açık grafik görüntüsü. Boş bırakılırsa large_icon kullanılır." + twitter_summary_large_image: "Twitter kartı 'özet büyük resim' (en az 280 genişliğinde ve en az 150 yüksekliğinde olmalıdır). Boş bırakılırsa opengraph_image kullanılarak normal kart meta verileri oluşturulur." notification_email: "Tüm önemli sistem e-postaları için kullanılacak olan gönderen e-posta adresi. E-postaların başarıyla ulaşması için buraya girilen alan adının SPF, DKIM ve reverse PTR kayıtlarının doğru yapılması lazım." email_custom_headers: "Sınırlandırılmış özel e-posta başlıkları listesi" email_subject: "Standart e-postalar için özelleştirilebilir konu biçimi. Bkz. https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801" @@ -1455,7 +1458,7 @@ tr_TR: enable_system_message_replies: "Kişisel mesajlar devre dışı bırakılsa bile kullanıcıların sistem mesajlarını yanıtlamasına izin verir" enable_long_polling: "Bildiri için kullanılan ileti yolu uzun sorgular yapabilir" enable_chunked_encoding: "Sunucu tarafından yığınlanmış kodlama yanıtlarını etkinleştirin. Bu özellik çoğu kurulumda çalışır, ancak bazı proxy'ler arabelleğe alabilir ve yanıtların gecikmesine neden olabilir" - long_polling_base_url: "Uzun sorgular için kullanılan baz URL (CDN dinamik içerik sunuyorsa, bunu origin olarak ayarladığına emin ol) ör: http://origin.site.com" + long_polling_base_url: "Uzun sorgular için kullanılan baz URL (CDN dinamik içerik sunuyorsa bunu origin olarak ayarladığınıza emin olun) örn: http://origin.site.com." long_polling_interval: "Gönderilecek bilgi olmadığı zaman sunucunun kullanıcılara geri dönmeden önce beklemesi gereken zaman (sadece giriş yapmış kullanıcın için)" polling_interval: "Uzun sorgular yapılmadığı zaman, kaç mili saniyede bir giriş yapmış kullanıcılar poll yapmalı" anon_polling_interval: "Kaç mili saniyede bir anonim kullanıcılar sorgu yapmalı" @@ -1465,18 +1468,18 @@ tr_TR: auto_close_topic_sensitivity: "Raporlanan bir konunun otomatik olarak kapatılma olasılığı" cooldown_minutes_after_hiding_posts: "Topluluk tarafından bildirilerek gizlenen gönderiyi düzenleyebilmek için, kullanıcının beklemesi gereken dakika süresi" max_topics_in_first_day: "Kullanıcının ilk gönderisini oluşturduktan sonraki 24 saatlik zaman dilimi içerisinde oluşturmasına izin verilen konu sayısı." - max_replies_in_first_day: "Kullanıcının ilk gönderisini oluşturduktan sonraki 24 saatlik zaman dilimi içerisinde oluşturabileceği cevap sayısı." - tl2_additional_likes_per_day_multiplier: "Güvenlik seviyesi 2 (Üye) olanlar için günlük beğeni limitini bu rakamla çarparak artır" - tl3_additional_likes_per_day_multiplier: "Güven seviyesi 3 (Müdavim) olanlar için günlük beğeni limitini bu rakamla çarparak artır" - tl4_additional_likes_per_day_multiplier: "Güvenlik seviyesi 4 (Lider) olanlar için günlük beğeni limitini bu rakamla çarparak artır" - tl2_additional_edits_per_day_multiplier: "Güvenlik seviyesi 2 (üye) olanlar için günlük düzenleme limitini bu rakamla çarparak artır" - tl3_additional_edits_per_day_multiplier: "Güven seviyesi 3 (müdavim) olanlar için günlük düzenleme limitini bu rakamla çarparak artır" - tl4_additional_edits_per_day_multiplier: "Güvenlik seviyesi 4 (lider) olanlar için günlük düzenleme limitini bu rakamla çarparak artır" - num_users_to_silence_new_user: "Eğer, yeni bir kullanıcının gönderileri buradaki sayı kadar farklı kullanıcı tarafından num_flags_to_block_new_user rapor alırsa, kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin." + max_replies_in_first_day: "Kullanıcının ilk gönderisini oluşturduktan sonraki 24 saatlik zaman dilimi içerisinde oluşturabileceği yanıt sayısı." + tl2_additional_likes_per_day_multiplier: "Güvenlik düzeyi 2 (Üye) olanlar için günlük beğeni limitini bu rakamla çarparak artır" + tl3_additional_likes_per_day_multiplier: "Güven düzeyi 3 (Müdavim) olanlar için günlük beğeni limitini bu rakamla çarparak artır" + tl4_additional_likes_per_day_multiplier: "Güvenlik düzeyi 4 (Lider) olanlar için günlük beğeni limitini bu rakamla çarparak artır" + tl2_additional_edits_per_day_multiplier: "Güvenlik düzeyi 2 (üye) olanlar için günlük düzenleme limitini bu rakamla çarparak artır" + tl3_additional_edits_per_day_multiplier: "Güven düzeyi 3 (müdavim) olanlar için günlük düzenleme limitini bu rakamla çarparak artır" + tl4_additional_edits_per_day_multiplier: "Güvenlik düzeyi 4 (lider) olanlar için günlük düzenleme limitini bu rakamla çarparak artır" + num_users_to_silence_new_user: "Eğer, yeni bir kullanıcının gönderileri buradaki sayı kadar farklı kullanıcı tarafından num_flags_to_block_new_user rapor alırsa kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin." num_tl3_flags_to_silence_new_user: "Eğer, yeni bir kullanıcının gönderileri num_flags_to_block_new_user güven düzeyi 3 olan farklı kullanıcılardan buradaki sayı kadar bayrak alırsa , kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin." - num_tl3_users_to_silence_new_user: "Eğer, yeni bir kullanıcının gönderileri buradaki sayı kadar farklı güven seviyesi 3 olan kullanıcı tarafından num_flags_to_block_new_user rapor alırsa, kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin." - notify_mods_when_user_silenced: "Bir kullanıcı otomatik olarak susturulursa, tüm moderatörlere bir mesaj gönderin." - flag_sockpuppets: "Yeni bir kullanıcı, konuyu başlatan kullanıcıyla aynı IP adresinden bir konuyu yanıtlarsa, her ikisinin gönderisini de potansiyel spam olarak işaretleyin." + num_tl3_users_to_silence_new_user: "Eğer, yeni bir kullanıcının gönderileri buradaki sayı kadar farklı güven düzeyi 3 olan kullanıcı tarafından num_flags_to_block_new_user rapor alırsa kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin." + notify_mods_when_user_silenced: "Bir kullanıcı otomatik olarak susturulursa tüm moderatörlere bir mesaj gönderin." + flag_sockpuppets: "Yeni bir kullanıcı, konuyu başlatan kullanıcıyla aynı IP adresinden bir konuyu yanıtlarsa her ikisinin gönderisini de potansiyel spam olarak işaretleyin." traditional_markdown_linebreaks: "Markdown'da, satır sonundan önce yazının sağında iki tane boşluk gerektiren, geleneksel satır sonu metodunu kullan." enable_markdown_typographer: "Metnin okunabilirliğini artırmak için tipografi kurallarını kullanın: düz tırnakları ' kıvırcık tırnaklarla ’ , (c) (tm) sembollerle, - emdash ile - vb." enable_markdown_linkify: "Bağlantıya benzeyen metni otomatik bağlantı olarak ele alın: www.ornek.com ve https://ornek.com otomatik olarak bağlanır" @@ -1505,15 +1508,16 @@ tr_TR: allowed_onebox_iframes: "Onebox yerleştirmeleri aracılığıyla izin verilen iframe src etki alanlarının listesi. `*` tüm varsayılan Onebox motorlarına izin verir." allowed_iframes: "Gönderilerde güvenli bir şekilde izin verebilecek iframe src alan adı öneklerinin listesi" allowed_crawler_user_agents: "Siteye erişmesine izin verilmesi gereken ağ tarayıcılarının kullanıcı aracıları. UYARI! BU AYARLAR, BURADA LİSTEN OLMAYAN TÜM TARAYICILARI ÇIKARACAKTIR!" - slow_down_crawler_user_agents: "Tarama gecikmesi yönergesi kullanılarak robots.txt dosyasında hız sınırlaması gereken ağ tarayıcılarının kullanıcı aracıları" - slow_down_crawler_rate: "slow_down_crawler_user_agents belirtilirse, bu oran tüm tarayıcılara uygulanır (istekler arasında saniye cinsinden gecikme sayısı)." + blocked_crawler_user_agents: "Siteye erişmesine izin verilmemesi gereken web tarayıcılarını tanımlayan kullanıcı aracısı dizesindeki benzersiz BÜYÜK/küçük harf duyarsız sözcük. İzin listesi tanımlanmışsa geçerli değildir." + slow_down_crawler_rate: "slow_down_crawler_user_agents belirtilirse bu oran tüm tarayıcılara uygulanır (istekler arasında saniye cinsinden gecikme sayısı)." content_security_policy: "İçerik-Güvenlik-Politikasını Etkinleştir" content_security_policy_report_only: "Yalnızca İçerik-Güvenlik-İlke-Raporunu Etkinleştir" content_security_policy_collect_reports: "/ Csp_reports adresinde CSP ihlali raporu toplamayı etkinleştir" content_security_policy_frame_ancestors: "Bu sitenin CSP aracılığıyla iframe çerçevesine yerleştirilebilirliğini kısıtlayın. İzin verilen alan adlarını Gömme adresinde yönetin." + content_security_policy_script_src: "Ek izin verilmiş betik kaynakları. Geçerli makine ve CDN öntanımlı olarak içerilir. Bkz. Mitigate XSS Attacks with Content Security Policy." invalidate_inactive_admin_email_after_days: "Bu günlerde siteyi ziyaret etmeyen yönetici hesaplarının giriş yapmadan önce e-posta adreslerini yeniden doğrulamaları gerekir. Devre dışı bırakmak için 0 olarak ayarlayın." top_menu: "Anasayfa gezingesinde nelerin, hangi sırada yer alacağını belirleyin. Örneğin en sonIyeniIokunmamışIkategorilerIgözdeIokunmuşlarIgönderilenlerIimlenenler" - post_menu: "Gönderi menüsündeki öğelerin hangi sırada yer alacağını belirleyin. Örnek: beğen|düzenle|bildir|sil|paylaş|imle|cevapla" + post_menu: "Gönderi menüsündeki öğelerin hangi sırada yer alacağını belirleyin. Örnek: beğen|düzenle|bildir|sil|paylaş|imle|yanıtla" post_menu_hidden_items: "Gönderi menüsündeki maddeler, genişletme üç noktasına tıklanmadığı takdirde otomatik olarak gizlenir." share_links: "Paylaşım penceresinde hangi maddelerin ne sırada gözükeceğini belirleyin." site_contact_username: "Tüm otomatik iletiler için gönderen kişi olarak gözükecek geçerli bir görevli kullanıcı adı. Boş bırakılırsa öntanımlı Sistem hesabı kullanılacak." @@ -1521,17 +1525,17 @@ tr_TR: send_welcome_message: "Tüm yeni kullanıcılara bir hoş geldiniz iletisi ile beraber hızlı başlangıç kılavuzu gönderin." send_tl1_welcome_message: "Yeni güven düzeyi 1 kullanıcılarına hoş geldiniz iletisi gönderin." send_tl2_promotion_message: "Yeni güven düzeyi 2 kullanıcılarına yükseltme hakkında bir mesaj gönderin." - suppress_reply_directly_below: "Bu gönderinin direk altında sadece tek bir cevap varsa, gönderideki açılabilir cevap sayısı bölümünü gösterme." - suppress_reply_directly_above: "Bu gönderinin direk üstünde sadece tek bir cevap varsa, gönderideki açılabilir hangi-cevaba-istinaden-cevapla bölümünü gösterme." + suppress_reply_directly_below: "Bu gönderinin hemen altında yalnızca tek bir yanıt varsa gönderideki açılabilir yanıt sayısı bölümünü gösterme." + suppress_reply_directly_above: "Bu gönderinin hemen üstünde yalnızca tek bir yanıt varsa gönderideki açılabilir hangi-yanıta-istinaden-yanıtla bölümünü gösterme." remove_full_quote: "Doğrudan yanıtlardaki tüm alıntıları otomatik olarak kaldırın." - suppress_reply_when_quoting: "Gönderi cevabı alıntılarsa, gönderideki açılabilir hangi-cevaba-istinaden-cevapla bölümünü gösterme." - max_reply_history: "Hangi-cevaba-istinaden-cevapla bölümü açılınca gösterilecek en fazla cevap sayısı" + suppress_reply_when_quoting: "Gönderi yanıtı alıntılarsa gönderideki açılabilir hangi-yanıta-istinaden-yanıta bölümünü gösterme." + max_reply_history: "Hangi-yanıta-istinaden-yanıtla bölümü açılınca gösterilecek en fazla yanıt sayısı" topics_per_period_in_top_summary: "Gözde konular özetinde gösterilen gözde konu sayısı." topics_per_period_in_top_page: "'Daha Fazla Göster' ile genişletilen gözde konular bölümünde gösterilecek gözde konu sayısı." redirect_users_to_top_page: "Yeni ve uzun süredir giriş yapmamış kullanıcıları otomatik olarak Gözde sayfasına yönlendir." top_page_default_timeframe: "Üst sayfa görünümü için öntanımlı zaman aralığı" moderators_view_emails: "Moderatörlerin kullanıcı e-postalarını görüntülemesine izin ver" - prioritize_username_in_ux: "Kullanıcı sayfası, kullanıcı kartı ve gönderilerde kullanıcı adını ilk olarak göster(devre dışı ise gerçek isim önce gözükür)" + prioritize_username_in_ux: "Kullanıcı sayfası, kullanıcı kartı ve gönderilerde kullanıcı adını ilk olarak göster(devre dışı ise gerçek ad önce gözükür)" enable_rich_text_paste: "Besteciye metin yapıştırırken otomatik HTML'den Markdown'a dönüştürme özelliğini etkinleştirin. (Deneysel)" send_old_credential_reminder_days: "Kimlik bilgilerinin değiştirilmesini hatırlatma için gün frekansı" email_token_valid_hours: "Parolamı unuttum / hesap etkinleştirme jetonları (n) saat geçerlidir." @@ -1541,6 +1545,7 @@ tr_TR: allow_index_in_robots_txt: "Robots.txt dosyasında bu sitenin web arama motorları tarafından dizine eklenmesine izin verildiğini belirtin. İstisnai durumlarda kalıcı olarak robots.txt dosyasını geçersiz kılabilirsiniz ." blocked_email_domains: "Kullanıcıların kayıt olurken kullanamayacağı e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. Örneğin: mailinator.com|trashmail.net" allowed_email_domains: "Kullanıcıların kayıt olurken kullanmak ZORUNDA olduğu e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. UYARI: Bu listede yer almayan e-posta alan adları kabul edilmeyecektir!" + normalize_emails: "Normalleştirilmiş e-postanın benzersiz olup olmadığını kontrol edin. Normalleştirilmiş e-posta, kullanıcı adındaki tüm noktaları ve + ve @ sembolleri arasındaki her şeyi kaldırır." auto_approve_email_domains: "E-posta adresleri bu listedeki alan adlarından olan kullanıcılar otomatik olarak onaylanacaktır." hide_email_address_taken: "Kullanıcıları, kayıt sırasında ve parolamı unuttum formunda o e-posta adresiyle bir hesap bulunduğunu bildirmeyin." log_out_strict: "Çıkış yapılırken, kullanıcının tüm cihazlardaki TÜM seanslarını sonlandır" @@ -1548,15 +1553,18 @@ tr_TR: new_version_emails: "Discourse'un yeni sürümü çıktığında contact_email adresine e-posta gönder." invite_expiry_days: "Kullanıcı davet anahtarlarının geçerlilik süresi, gün olarak" invite_only: "Tüm yeni kullanıcılar, güvenilir kullanıcılar veya yetkili tarafından açıkça davet edilmelidir. Herkese açık kayıt devre dışı." - login_required: "Bu sitede içerik görüntülenebilmesi için kimlik doğrulamayı zorunlu kıl, isimsiz girişe izin verme." - min_username_length: "Karakter cinsinden minimum kullanıcı adı uzunluğu. UYARI: mevcut kullanıcı veya grupların adları bundan daha kısaysa, siteniz bozulur!" - max_username_length: "Karakter cinsinden maksimum kullanıcı adı uzunluğu. UYARI: mevcut olan kullanıcı veya grupların adları bundan daha uzunsa, siteniz bozulur!" + login_required: "Bu sitede içerik görüntülenebilmesi için kimlik doğrulamayı zorunlu kıl, adsız girişe izin verme." + min_username_length: "Karakter cinsinden minimum kullanıcı adı uzunluğu. UYARI: Mevcut kullanıcı veya grupların adları bundan daha kısaysa siteniz bozulur!" + max_username_length: "Karakter cinsinden maksimum kullanıcı adı uzunluğu. UYARI: mevcut olan kullanıcı veya grupların adları bundan daha uzunsa siteniz bozulur!" unicode_usernames: "Kullanıcı adlarının ve grup adlarının Unicode harfleri ve sayıları içermesine izin verin." + allowed_unicode_username_characters: "Kullanıcı adlarında yalnızca bazı Unicode karakterlere izin vermek için normal ifade. ASCII harflere ve sayılara her zaman izin verilir ve izin verilenler listesine dahil edilmeleri gerekmez." reserved_usernames: "Kayıt işlemine izin verilmeyen kullanıcı adları. Joker karakter * herhangi bir karakteri sıfır veya daha fazla kez eşleştirmek için kullanılabilir." min_password_length: "Parolanın en az uzunluğu." min_admin_password_length: "Yönetici için parolanın en az uzunluğu." password_unique_characters: "Bir parolanın olması gereken minimum benzersiz karakter sayısı." block_common_passwords: "En çok kullanılan 10,000 parola arasında yer alan parolalara izin verme." + auth_skip_create_confirm: Harici kimlik doğrulaması ile kaydolurken hesap oluştur açılır penceresini atlayın. En iyi auth_overrides_email, auth_overrides_username ve auth_overrides_name ile birlikte kullanılır. + auth_immediately: "Kullanıcı etkileşimi olmadan otomatik olarak harici giriş sistemine yönlendirin. Bu yalnızca login_required true olduğunda ve yalnızca bir harici kimlik doğrulama yöntemi olduğunda etkili olur." discourse_connect_url: "DiscourseConnect uç noktasının URL'si (http:// veya https:// içermelidir)" discourse_connect_secret: "DiscourseConnect bilgilerini kriptografik olarak doğrulamak için kullanılan gizli string, 10 karakter veya daha uzun olduğundan emin olun" discourse_connect_overrides_bio: "Kullanıcı profilindeki kullanıcı biyografisini geçersiz kılar ve kullanıcının bunu değiştirmesini önler" @@ -1579,12 +1587,13 @@ tr_TR: discord_client_id: 'Discord İstemci Kimliği (birine ihtiyacınız var mı? Discord geliştirici portalını ziyaret edin)' discord_secret: "Discord Gizli Anahtarı" enable_backups: "Yöneticilerin forumun yedeklerini oluşturmalarına izin ver" + allow_restore: "Geri yüklemeye izin ver; ancak bu TÜM site verisini başkasıyla değiştirebilir. Bir yedekten geri yükleme yapmayı tasarlamıyorsanız devre dışı olarak bırakın." maximum_backups: "Diskte tutulacak en fazla yedek sayısı. Eski yedekler otomatik olarak silinir." automatic_backups_enabled: "Yedek sıklığında tanımlandığı gibi otomatik yedek almayı çalıştır" backup_frequency: "Yedeklemeler arasındaki gün sayısı." s3_backup_bucket: "Yedeklemelerin yüklenmesi için uzak biriktirme yeri. UYARI: Özel bir biriktirme yeri olduğundan emin olun" s3_endpoint: "Bitiş noktası, DigitalOcean Spaces veya Minio gibi S3 uyumlu bir hizmete yedekleme yapmak için değiştirilebilir. UYARI: AWS S3 kullanıyorsanız boş bırakın." - s3_configure_tombstone_policy: "Kaldırıldı olarak işaretleme yüklemeleri için otomatik silme politikasını etkinleştirin. ÖNEMLİ: Devre dışı bırakılırsa, yüklemeler silindikten sonra yer kazanılamaz." + s3_configure_tombstone_policy: "Kaldırıldı olarak işaretleme yüklemeleri için otomatik silme politikasını etkinleştirin. ÖNEMLİ: Devre dışı bırakılırsa yüklemeler silindikten sonra yer kazanılamaz." enable_s3_inventory: "Amazon S3 envanterini kullanarak raporlar oluşturun ve yüklemeleri doğrulayın. ÖNEMLİ: geçerli S3 kimlik bilgileri gerektirir (hem erişim anahtarı kimliği hem de gizli erişim anahtarı)." backup_time_of_day: "Yedeklemenin yapılacağı vaktin gün içindeki UTC zamanı." backup_with_uploads: "Planlanmış yedeklere yüklemeleri de dahil et. Etkisizleştirilirse sadece veritabanı yedeklenecek." @@ -1615,7 +1624,7 @@ tr_TR: invite_link_max_redemptions_limit_users: "Normal kullanıcılar tarafından oluşturulan davet bağlantıları için izin verilen maksimum kullanım sayısı bu değerden fazla olamaz." alert_admins_if_errors_per_minute: "Bir yönetici uyarısını tetiklemek için dakika başına hata sayısı. 0 değeri bu özelliği devre dışı bırakır. NOT: yeniden başlatma gerektirir." alert_admins_if_errors_per_hour: "Bir yönetici uyarısını tetiklemek için saat başına hata sayısı. 0 değeri bu özelliği devre dışı bırakır. NOT: yeniden başlatma gerektirir." - categories_topics: "Kategoriler sayfasında gösterilecek konu sayısı. 0 olarak ayarlanırsa, iki sütunu simetrik (kategoriler ve konular) tutmak için otomatik olarak bir değer bulmaya çalışır." + categories_topics: "Kategoriler sayfasında gösterilecek konu sayısı. 0 olarak ayarlanırsa iki sütunu simetrik (kategoriler ve konular) tutmak için otomatik olarak bir değer bulmaya çalışır." suggested_topics: "Konunun en altında yer alan, önerilen konu sayısı." limit_suggested_to_category: "Önerilen konularda sadece kullanıcının bulunduğu kategoriye ait konuları göster." suggested_topics_max_days_old: "Önerilen konular n günden daha eski olmamalı." @@ -1651,62 +1660,62 @@ tr_TR: composer_media_optimization_image_encode_quality: "Yeniden kodlama işleminde kullanılan JPEG kodlama kalitesi." min_ratio_to_crop: "Uzun görüntüleri kırpmak için kullanılan oran. Genişlik / yükseklik sonucunu girin." simultaneous_uploads: "Besteciye sürüklenip bırakılabilecek maksimum dosya sayısı" - default_invitee_trust_level: "Davet edilen kullanıcılar için öntanımlı güven seviyesi (0-4)." - default_trust_level: "Tüm yeni kullanıcılar için öntanımlı güven seviyesi (0-4). DİKKAT! Bu ayarı değiştirmeniz ciddi seviyede istenmeyen gönderi riski doğurabilir." - tl1_requires_topics_entered: "Yeni bir kullanıcının güven seviyesi 1'e yükseltilmeden önce oluşturması gereken konu sayısı." - tl1_requires_read_posts: "Yeni bir kullanıcının güven seviyesi 1'e yükseltilmeden önce okuması gereken gönderi sayısı." - tl1_requires_time_spent_mins: "Yeni bir kullanıcının güven seviyesi 1'e yükseltimeden önce gönderi okuyarak geçirmesi gereken dakika miktarı." - tl2_requires_topics_entered: "Bir kullanıcının güven seviyesi 2'ye yükseltimeden önce oluşturması gereken konu sayısı." - tl2_requires_read_posts: "Bir kullanıcının güven seviyesi 2'ye yükseltimeden önce okuması gereken gönderi sayısı." - tl2_requires_time_spent_mins: "Bir kullanıcının güven seviyesi 2'ye yükseltimeden önce gönderi okuyarak geçirmesi gereken dakika miktarı." - tl2_requires_days_visited: "Bir kullanıcının güven seviyesi 2'ye yükseltilmeden önce siteye girmesi gereken gün sayısı." - tl2_requires_likes_received: "Bir kullanıcının güven seviyesi 2'ye yükseltilmeden önce alması gereken beğeni sayısı." - tl2_requires_likes_given: "Bir kullanıcının güven seviyesi 2'ye yükseltilmeden önce vermesi gereken beğeni sayısı." - tl2_requires_topic_reply_count: "Bir kullanıcının güven seviyesi 2'ye yükseltilmeden önce cevaplaması gereken konu sayısı." - tl3_time_period: "Güven Seviyesi 3 için gereken zaman (gün olarak)" - tl3_requires_days_visited: "Kullanıcının güven seviyesi 3'e yükselmeye hak kazanması için son günlerde (gs3 için gereken zaman içerisinde) siteyi ziyaret etmiş olması gereken en az gün sayısı. gs3'e ulaşmayı engellemek için gs3 için gereken zamandan daha fazla bir değer girin. (0 veya daha fazla)" - tl3_requires_topics_replied_to: "Kullanıcının güven seviyesi 3'e yükselmeye hak kazanması için son günlerde (gs3 için gereken zaman içerisinde) cevaplaması gereken en az konu sayısı (0 veya daha fazla)" - tl3_requires_topics_viewed: "Kullanıcının güven seviyesi 3'e yükselmeye hak kazanması için son günlerde (gs3 için gereken zaman içerisinde) okumuş olması gereken konuların yüzdesi (0-100 arası)" + default_invitee_trust_level: "Davet edilen kullanıcılar için öntanımlı güven düzeyi (0-4)." + default_trust_level: "Tüm yeni kullanıcılar için öntanımlı güven düzeyi (0-4). DİKKAT! Bu ayarı değiştirmeniz ciddi düzeyinde istenmeyen gönderi riski doğurabilir." + tl1_requires_topics_entered: "Yeni bir kullanıcının güven düzeyi 1'e yükseltilmeden önce oluşturması gereken konu sayısı." + tl1_requires_read_posts: "Yeni bir kullanıcının güven düzeyi 1'e yükseltilmeden önce okuması gereken gönderi sayısı." + tl1_requires_time_spent_mins: "Yeni bir kullanıcının güven düzeyi 1'e yükseltimeden önce gönderi okuyarak geçirmesi gereken dakika miktarı." + tl2_requires_topics_entered: "Bir kullanıcının güven düzeyi 2'ye yükseltimeden önce oluşturması gereken konu sayısı." + tl2_requires_read_posts: "Bir kullanıcının güven düzeyi 2'ye yükseltimeden önce okuması gereken gönderi sayısı." + tl2_requires_time_spent_mins: "Bir kullanıcının güven düzeyi 2'ye yükseltimeden önce gönderi okuyarak geçirmesi gereken dakika miktarı." + tl2_requires_days_visited: "Bir kullanıcının güven düzeyi 2'ye yükseltilmeden önce siteye girmesi gereken gün sayısı." + tl2_requires_likes_received: "Bir kullanıcının güven düzeyi 2'ye yükseltilmeden önce alması gereken beğeni sayısı." + tl2_requires_likes_given: "Bir kullanıcının güven düzeyi 2'ye yükseltilmeden önce vermesi gereken beğeni sayısı." + tl2_requires_topic_reply_count: "Bir kullanıcının güven düzeyi 2'ye yükseltilmeden önce yanıtlaması gereken konu sayısı." + tl3_time_period: "Güven Düzeyi 3 için gereken zaman (gün olarak)" + tl3_requires_days_visited: "Kullanıcının güven düzeyi 3'e yükselmeye hak kazanması için son günlerde (gs3 için gereken zaman içerisinde) siteyi ziyaret etmiş olması gereken en az gün sayısı. gs3'e ulaşmayı engellemek için gs3 için gereken zamandan daha fazla bir değer girin. (0 veya daha fazla)" + tl3_requires_topics_replied_to: "Kullanıcının güven düzeyinin 3'e yükselmeye hak kazanması için son günlerde (gs3 için gereken zaman içerisinde) yanıtlaması gereken en az konu sayısı (0 veya daha fazla)." + tl3_requires_topics_viewed: "Kullanıcının güven düzeyi 3'e yükselmeye hak kazanması için son günlerde (gs3 için gereken zaman içerisinde) okumuş olması gereken konuların yüzdesi (0-100 arası)" tl3_requires_topics_viewed_cap: "Son günlerde (gs3 için gereken zaman içerisinde) görüntülenmesi gereken en fazla konu sayısı." tl3_requires_posts_read: "Son 3 (tl3 zaman dilimi) gün içinde oluşturulan ve kullanıcının 3. düzeydeki güvenilirliğe yükseltilmesi için izlemesi gereken gönderilerin yüzdesi (0 - 100)" tl3_requires_posts_read_cap: "Son günlerde (gs3 için gereken zaman içerisinde) okunması gereken en fazla konu sayısı." - tl3_requires_topics_viewed_all_time: "Bir kullanıcının güven seviyesi 3'e yükselmeye hak kazanması için görüntülemesi gereken toplam en az konu sayısı." - tl3_requires_posts_read_all_time: "Bir kullanıcının güven seviyesi 3'e yükselmeye hak kazanması için görüntülemesi gereken toplam en az gönderi sayısı." - tl3_requires_max_flagged: "Bir kullanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için, son (tl3 time period) gün içinde x farklı kullanıcı tarafından x adetten fazla gönderisinin raporlanmış olmaması gerekir. x bu ayara verilen değerdir. (0 ya da daha yüksek)" - tl3_promotion_min_duration: "Bir kullanıcının güven seviyesi 2'ye düşürülebilmesi için güven seviyesi 3'te geçirmesi gereken en az gün sayısı." - tl3_requires_likes_given: "Kullanıcının güven seviyesi 3'e yükselmeye hak kazanması için son günlerde (gs3 için gereken zaman içerisinde) vermesi gereken beğeni sayısı." - tl3_requires_likes_received: "Kullanıcının güven seviyesi 3'e ulaşmak için son günlerde (gs3 için gereken zaman içerisinde) alması gereken en az beğeni sayısı." - tl3_links_no_follow: "Güven seviyesi 3'teki kullanıcılar tarafından paylaşılan linklerdeki rel=nofollow'u kaldırma." + tl3_requires_topics_viewed_all_time: "Bir kullanıcının güven düzeyi 3'e yükselmeye hak kazanması için görüntülemesi gereken toplam en az konu sayısı." + tl3_requires_posts_read_all_time: "Bir kullanıcının güven düzeyi 3'e yükselmeye hak kazanması için görüntülemesi gereken toplam en az gönderi sayısı." + tl3_requires_max_flagged: "Bir kullanıcının güven düzeyi 3'e yükseltilmeye hak kazanması için, son (tl3 time period) gün içinde x farklı kullanıcı tarafından x adetten fazla gönderisinin raporlanmış olmaması gerekir. x bu ayara verilen değerdir. (0 ya da daha yüksek)" + tl3_promotion_min_duration: "Bir kullanıcının güven düzeyi 2'ye düşürülebilmesi için güven düzeyi 3'te geçirmesi gereken en az gün sayısı." + tl3_requires_likes_given: "Kullanıcının güven düzeyi 3'e yükselmeye hak kazanması için son günlerde (gs3 için gereken zaman içerisinde) vermesi gereken beğeni sayısı." + tl3_requires_likes_received: "Kullanıcının güven düzeyi 3'e ulaşmak için son günlerde (gs3 için gereken zaman içerisinde) alması gereken en az beğeni sayısı." + tl3_links_no_follow: "Güven düzeyi 3'teki kullanıcılar tarafından paylaşılan bağlantılardaki rel=nofollow'u kaldırma." trusted_users_can_edit_others: "Yüksek güven düzeyine sahip kullanıcıların diğer kullanıcılardan içerik düzenlemesine izin ver" - min_trust_to_create_topic: "Yeni bir konu oluşturmak için gereken en az güven seviyesi." - allow_flagging_staff: "Etkinleştirilirse, kullanıcılar yetkili hesaplardaki yayınları raporlayabilir." - min_trust_to_edit_wiki_post: "Wiki olarak işaretlenmiş bir gönderiyi düzenleyebilmek için gereken en az güven seviyesi." - min_trust_to_edit_post: "Gönderilerin düzenlenebilmesi için gereken en düşük güven seviyesi." - min_trust_to_allow_self_wiki: "Kullanıcının kendi wiki gönderisini oluşturabilmesi için gereken güven seviyesi." - min_trust_to_send_messages: "Yeni kişisel iletiler oluşturmak için gereken minimum güven seviyesi." - min_trust_to_send_email_messages: "E-postayla kişisel mesaj göndermek için gereken minimum güven seviyesi." - min_trust_to_flag_posts: "Gönderileri raporlamak için gereken minimum güven seviyesi" - min_trust_to_post_links: "Gönderilere bağlantı eklemek için gereken minimum güven seviyesi" + min_trust_to_create_topic: "Yeni bir konu oluşturmak için gereken en az güven düzeyi." + allow_flagging_staff: "Etkinleştirilirse kullanıcılar yetkili hesaplardaki yayınları raporlayabilir." + min_trust_to_edit_wiki_post: "Viki olarak işaretlenmiş bir gönderiyi düzenleyebilmek için gereken en az güven düzeyi." + min_trust_to_edit_post: "Gönderilerin düzenlenebilmesi için gereken en düşük güven düzeyi." + min_trust_to_allow_self_wiki: "Kullanıcının kendi viki gönderisini oluşturabilmesi için gereken güven düzeyi." + min_trust_to_send_messages: "Yeni kişisel iletiler oluşturmak için gereken minimum güven düzeyi." + min_trust_to_send_email_messages: "E-postayla kişisel mesaj göndermek için gereken minimum güven düzeyi." + min_trust_to_flag_posts: "Gönderileri raporlamak için gereken minimum güven düzeyi" + min_trust_to_post_links: "Gönderilere bağlantı eklemek için gereken minimum güven düzeyi" min_trust_to_post_embedded_media: "Gönderilere medya öğesi gömebilmek için gereken minimum güven düzeyi" min_trust_level_to_allow_profile_background: "Profil arka planı yüklemek için gereken minimum güven düzeyi" min_trust_level_to_allow_user_card_background: "Kullanıcı kartı arka planını yüklemek için gereken minimum güven düzeyi" min_trust_level_to_allow_invite: "Kullanıcıları davet etmek için gereken minimum güven düzeyi" min_trust_level_to_allow_ignore: "Kullanıcıları yoksaymak için gereken minimum güven düzeyi" - allowed_link_domains: "Kullanıcıların bağlantı göndermek için uygun güven seviyesine sahip olmasalar bile bağlanabilecekleri alanlar" + allowed_link_domains: "Kullanıcıların bağlantı göndermek için uygun güven düzeyine sahip olmasalar bile bağlanabilecekleri alanlar" newuser_max_links: "Yeni bir kullanıcının bir gönderiye ekleyebileceği bağlantı sayısı." newuser_max_embedded_media: "Yeni bir kullanıcının bir gönderiye ekleyebileceği gömülü medya öğesi sayısı." newuser_max_attachments: "Yeni bir kullanıcının bir gönderiye ekleyebileceği dosya sayısı." - newuser_max_mentions_per_post: "Yeni bir kullanıcının bir gönderi içinde kullanabileceği en fazla @isim bildiri sayısı." - newuser_max_replies_per_topic: "Yeni bir kullanıcının tek bir konu içerisinde, başka bir kullanıcı ona cevap yazana kadar, girebileceği en fazla cevap sayısı." - max_mentions_per_post: "Bir kullanıcının bir gönderi içinde kullanabileceği en fazla @isim bildiri sayısı." + newuser_max_mentions_per_post: "Yeni bir kullanıcının bir gönderi içinde kullanabileceği en fazla @ad bildiri sayısı." + newuser_max_replies_per_topic: "Yeni bir kullanıcının tek bir konu içerisinde başka bir kullanıcı onu yanıtlayana kadar girebileceği en fazla yanıt sayısı." + max_mentions_per_post: "Bir kullanıcının bir gönderi içinde kullanabileceği en fazla @ad bildiri sayısı." max_users_notified_per_group_mention: "Grubun bahsi geçtiğinde bildirim alabilecek maksimum kullanıcı sayısı (Eğer eşik uyuşursa bildirim yapılmayacak)" enable_mentions: "Kullanıcıların diğer kullanıcılardan bahsetmesine izin verin." create_thumbnails: "Gönderiye sığmayacak kadar büyük olan görseller için küçük resimler ve lightbox resimleri oluştur." email_time_window_mins: "Kullanıcılara, gönderilerini düzenlemelerine ve tamamlamalarına fırsat vermek için herhangi bir bildiri e-postası göndermeden önce (n) dakika bekleyin." personal_email_time_window_seconds: "Kullanıcılara mesajlarını düzenleme ve sonlandırma şansı vermek için herhangi bir kişisel mesaj bildirim e-postası göndermeden önce (n) saniye bekleyin." - email_posts_context: "Genel durumu göstermek amaçlı, bildiri e-postalarında yer alacak önceki cevap sayısı." + email_posts_context: "Genel durumu gösterme amaçlı bildiri e-postalarında yer alacak önceki yanıt sayısı." flush_timings_secs: "Zaman verisinin sunucuya atılma sıklığı, saniye olarak." - title_max_word_length: "Konu başlığında kullanılan bir kelime için izin verilen en fazla karakter sayısı" + title_max_word_length: "Konu başlığında kullanılan bir sözcük için izin verilen en fazla karakter sayısı" title_min_entropy: "Konu başlığı için gereken en az entropi (tekil karakter, ingilizce-dışı karakterler daha fazla sayılır)" body_min_entropy: "Gönderi içeriği için gereken en az entropi (tekil karakter, ingilizce-dışı karakterler daha fazla sayılır)" allow_uppercase_posts: "Konu başlığı ya da gönderi metninin tümünün büyük harf kullanılarak girilebilmesine izin ver." @@ -1738,9 +1747,9 @@ tr_TR: topic_post_like_heat_low: "Beğeni:gönderi oranı bu oranı geçtiğinde, gönderi sayısı alanı hafifçe vurgulanır." topic_post_like_heat_medium: "Beğeni:gönderi oranı bu oranı geçtiğinde, gönderi sayısı alanı kısmen vurgulanır." topic_post_like_heat_high: "Beğeni:gönderi oranı bu oranı geçtiğinde, gönderi sayısı alanı belirgin şekilde vurgulanır." - faq_url: "Başka yerde barındırılan bir SSS'i kullanmak istiyorsanız, ilgili URL adresini buraya eksiksiz şekilde girin." - tos_url: "Başka yerde barındırılan bir Üyelik Sözleşmesi dökümanını kullanmak istiyorsanız, ilgili URL adresini buraya eksiksiz şekilde girin." - privacy_policy_url: "Başka yerde barındırılan bir Gizlilik İlkeleri dökümanını kullanmak istiyorsanız, ilgili URL adresini buraya eksiksiz şekilde girin." + faq_url: "Başka yerde barındırılan bir SSS'i kullanmak istiyorsanız ilgili URL adresini buraya eksiksiz şekilde girin." + tos_url: "Başka yerde barındırılan bir Üyelik Sözleşmesi belgesini kullanmak istiyorsanız ilgili URL adresini buraya eksiksiz şekilde girin." + privacy_policy_url: "Başka yerde barındırılan bir Gizlilik İlkeleri dökümanını kullanmak istiyorsanız ilgili URL adresini buraya eksiksiz şekilde girin." log_anonymizer_details: "Anonimleştirildikten sonra kullanıcının ayrıntılarını günlükte tutup tutmayacağı. GDPR'ye uyarken bunu kapatmanız gerekir." newuser_spam_host_threshold: "Yeni bir kullanıcı, `newuser_spam_host_threshold` gönderileri içerisinde aynı makineye, kaç kere bağlantı paylaşınca spam olarak algılansın." allowed_spam_host_domains: "Spam barındırma testinden hariç tutulan alan adı listesi. Yeni kullanıcıların, bu alan adlarına bağlantı içeren gönderi oluşturmaları hiç bir zaman engellenmeyecek." @@ -1753,16 +1762,17 @@ tr_TR: max_age_unmatched_ips: "Taranmış IP girişlerinden karşılığı olmayanları (N) gün sonunda sil." num_flaggers_to_close_topic: "Bir konunun moderatör müdahalesi için otomatik olarak durdurulmadan önce alması gereken en az tekil bildirim sayısı" num_hours_to_close_topic: "Bir konuyu, müdahale için duraklatacağı saat sayısı." - auto_respond_to_flag_actions: "Bir bildirim kaldırırken otomatik olarak cevaplamayı etkinleştir" + auto_respond_to_flag_actions: "Bir bayrağı kaldırırken otomatik yanıtlamayı etkinleştir." min_first_post_typing_time: "Milisaniye olarak bir kullanıcının ilk gönderisini yazarken geçmesi gereken en küçük süre, bu süre geçmezse gönderi otomatik olarak onaylanma kuyruğuna girer. Devre dışı bırakmak için 0'a ayarlayın (tavsiye edilmez)." auto_silence_fast_typers_on_first_post: "Min_first_post_typing_time ile tanışmayan kullanıcıları otomatik olarak susturma" - auto_silence_fast_typers_max_trust_level: "Hızlı yazıcıları otomatik olarak susturmak için maksimum güven seviyesi" + auto_silence_fast_typers_max_trust_level: "Hızlı yazıcıları otomatik olarak susturmak için maksimum güven düzeyi" reviewable_claiming: "İncelenebilir içeriğin üzerinde işlem yapılabilmesi için hak talebinde bulunulması gerekiyor mu?" reviewable_default_topics: "Konuya göre gruplandırılmış incelenebilir içeriği varsayılan olarak göster" reviewable_default_visibility: "Bu önceliği karşılamadıkça incelenebilir öğeleri gösterme" + reviewable_low_priority_threshold: "Öncelik süzgeci, '(herhangi bir)' süzgeci kullanılmadığı sürece bu puanı karşılamayan incelenebilir ögeleri gizler." cooldown_hours_until_reflag: "Kullanıcıların bir gönderiyi yeniden işaretleyebilene kadar beklemek zorunda kalacakları süre" - reply_by_email_enabled: "Konulara e-posta üzerinden cevap yazmayı etkinleştir." - reply_by_email_address: "Email ile cevapla özelliği için gelen e-posta adresi şablonu, örnek: %%{reply_key}@reply.example.com or replies+%%{reply_key}@example.com" + reply_by_email_enabled: "Konuları e-posta üzerinden yanıtlamayı etkinleştir." + reply_by_email_address: "Email ile yanıtla özelliği için gelen e-posta adresi şablonu, örnek: %%{reply_key}@yanıt.örnek veya yanıtlar+%%{reply_key}@örnek.com" alternative_reply_by_email_addresses: "E-posta adresleriyle gelen e-postaları yanıtlamak için alternatif şablonların listesi. Örnek:%%{reply_key}@reply.example.com |replies+%% {reply_key}@example.com" incoming_email_prefer_html: "Gelen e-postalar için metin yerine HTML kullanın." strip_incoming_email_lines: "Gelen e-postaların her satırındaki önde gelen ve arkadaki boşlukları kaldırın." @@ -1785,7 +1795,7 @@ tr_TR: hard_bounce_score: "Kalıcı bir geri sekme olduğunda kullanıcıya hemen geri sekme puanı eklenir." bounce_score_threshold: "Kullanıcıya e-posta gönderimi durdurmak için gereken en fazla geri seken posta sayısı" reset_bounce_score_after_days: "X gün sonra sekme puanını otomatik olarak sıfırlayın." - blocked_attachment_content_types: "İçerik türüne göre ekleri engellemek için kullanılan anahtar kelimelerin listesi." + blocked_attachment_content_types: "İçerik türüne göre ekleri engellemek için kullanılan anahtar sözcüklerin listesi." forwarded_emails_behaviour: "Discourse'a yönlendirilen bir e-posta nasıl ele alınır?" always_show_trimmed_content: "Her zaman gelen e-postaların kırpılmış bölümünü göster. UYARI: e-posta adreslerini gösterebilir." trim_incoming_emails: "Gelen e-postaların alakalı olmayan kısmını kırp." @@ -1795,7 +1805,7 @@ tr_TR: raw_rejected_email_max_length: "Reddedilmiş gelen e-posta için kaç karakter saklanması gerektiği." delete_rejected_email_after_days: "(n) günden daha eski reddedilen e-postaları silin." manual_polling_enabled: "E-posta yanıtları için API'yı kullanarak e-postaları aktarın." - pop3_polling_enabled: "E-posta cevapları için POP3 üzerinden sorgula" + pop3_polling_enabled: "E-posta yanıtları için POP3 üzerinden sorgula" pop3_polling_ssl: "POP3 sunucusuna bağlanırken SSL kullanın. (Tavsiye edilir)" pop3_polling_openssl_verify: "TLS sunucu sertifikasını doğrulayın (Varsayılan: etkin)" pop3_polling_period_mins: "Periyodik olarak POP3 hesabının e-posta için kontrol edilmesinin dakika bazında sıklığı. NOT: yeniden başlatma gerektirir" @@ -1806,7 +1816,7 @@ tr_TR: pop3_polling_delete_from_server: "Sunucudan e-postaları silin. NOT: Bunu devre dışı bırakırsanız posta gelen kutunuzu el ile temizlemeniz gerekir" log_mail_processing_failures: "Tüm e-posta işleme hatalarını / günlüklerine kaydet" email_in: 'Kullanıcıların e-posta aracılığıyla yeni konu oluşturabilmesine izin ver (pop3 sorgulaması gerektirir). Adresleri her kategorinin "Ayarlar" sekmesinden düzenleyin.' - email_in_min_trust: "Bir kullanıcının e-posta aracılığı ile yeni konu oluşturabilmesi için sahip olması gereken en az güven seviyesi." + email_in_min_trust: "Bir kullanıcının e-posta aracılığı ile yeni konu oluşturabilmesi için sahip olması gereken en az güven düzeyi." email_in_authserv_id: "Kimlik doğrulama yapan hizmetin tanımlayıcısı gelen e-postaları kontrol eder. Bunu yapılandırma talimatları için bkz. https://meta.discourse.org/t/134358 ." email_in_spam_header: "Spam tespit etmek için e-posta başlığı." enable_imap: "Grup mesajlarını senkronize etmek için IMAP'i etkinleştir." @@ -1816,12 +1826,12 @@ tr_TR: imap_polling_old_emails: "Bir IMAP kutusu her sorgulandığında güncellenecek (işlenen) maksimum eski e-posta sayısı (tümü için 0)." imap_polling_new_emails: "Bir IMAP kutusu her sorgulandığında güncellenecek maksimum yeni e-posta sayısı (işlenmemiş)." email_prefix: "E-postaların konu bölümünü belirten [label]. Boş bırakılırsa 'başlık' yazacak." - email_site_title: "Bu siteden giden e-postalarda gönderici olarak kullanılacak sitenin başlığı. Herhangi bir şey girilmezse öntanımlı olarak 'title' yazacak. Eğer 'başlık\" içeriğinizde, e-posta göndericisinin stringlerinde izin verilmeyen karakterler varsa, bu ayarı kullanın." - find_related_post_with_key: "Yanıtlanan postayı bulmak için yalnızca 'cevap anahtarını' kullanın. UYARI: bunun devre dışı bırakılması, e-posta adresine göre kullanıcının kimliğine bürünülmesine olanak tanır." + email_site_title: "Bu siteden giden e-postalarda gönderici olarak kullanılacak sitenin başlığı. Herhangi bir şey girilmezse öntanımlı olarak 'title' yazacak. Eğer 'başlık\" içeriğinizde, e-posta göndericisinin stringlerinde izin verilmeyen karakterler varsa bu ayarı kullanın." + find_related_post_with_key: "Yanıtlanan postayı bulmak için yalnızca 'yanıt anahtarını' kullanın. UYARI: Bunun devre dışı bırakılması e-posta adresine göre kullanıcının kimliğine bürünülmesine olanak tanır." minimum_topics_similar: "Yeni konu oluşturulurken, benzer konuların gösterilmesi için sitede olması gereken konu sayısı." relative_date_duration: "Gönderinin üstünden bu kadar gün geçtikten sonra, gönderi tarihi mutlak şekilde değil (20 Şubat) göreceli şekilde (7g) gösterilecek." delete_user_max_post_age: "İlk gönderisi (x) günden eski olan kullanıcıların silinmesine izin verme." - delete_all_posts_max: "Tüm Gönderileri Sil düğmesine basıldığında tek seferde silinebilecek en fazla gönderi sayısı. Eğer bir kullanıcının gönderi sayısı bu sayıdan fazlaysa, gönderilerin hepsi tek seferde silinemez ve bu kullanıcı silinemez." + delete_all_posts_max: "Tüm Gönderileri Sil düğmesine basıldığında tek seferde silinebilecek en fazla gönderi sayısı. Eğer bir kullanıcının gönderi sayısı bu sayıdan fazlaysa gönderilerin hepsi tek seferde silinemez ve bu kullanıcı silinemez." username_change_period: "Kayıtlardan sonra hesapların kullanıcı adlarını değiştirebileceği maksimum gün sayısı (kullanıcı adı değişikliğine izin vermemek için 0 girin)." email_editable: "Kullanıcıların kayıt olduktan sonra e-posta adreslerini değiştirmesine izin ver." logout_redirect: "Oturumu kapattıktan sonra tarayıcıyı yeniden yönlendirmek için konum (ör. https://example.com/logout)" @@ -1848,8 +1858,8 @@ tr_TR: enable_category_group_moderation: "Grupların belirli kategorilerdeki içeriği yönetmesine izin ver" group_in_subject: "PM'deki ilk grubun adına tabi e-postada %%{optional_pm} olarak ayarlayın, bkz: Standart e-postalar için konu biçimini özelleştirme" allow_anonymous_posting: "Kullanıcıların anonim moda geçebilmelerine izin ver" - anonymous_posting_min_trust_level: "Anonim gönderi oluşturabilmeyi etkinleştirebilmek için gereken en az güven seviyesi" - anonymous_account_duration_minutes: "Anonimliği koruyabilmek için, her kulanıcı için her N dakikada bir yeni bir anonim hesap oluştur. Örnek: 600'e ayarlanırsa, son gönderi üzerinden 600 dakika geçer geçmez VE kullanıcı anonim moddaysa, yeni bir anonim hesap oluşturulur." + anonymous_posting_min_trust_level: "Anonim gönderi oluşturabilmeyi etkinleştirebilmek için gereken en az güven düzeyi" + anonymous_account_duration_minutes: "Anonimliği koruyabilmek için, her kulanıcı için her N dakikada bir yeni bir anonim hesap oluştur. Örnek: 600'e ayarlanırsa son gönderi üzerinden 600 dakika geçer geçmez VE kullanıcı anonim moddaysa, yeni bir anonim hesap oluşturulur." hide_user_profiles_from_public: "Anonim kullanıcılar için kullanıcı kartlarını, kullanıcı profillerini ve kullanıcı dizinini devre dışı bırak" allow_users_to_hide_profile: "Kullanıcıların profillerini ve durumlarını gizlemelerine izin ver" allow_featured_topic_on_user_profiles: "Kullanıcıların, kullanıcı kartlarında ve profillerinde bir konuya bağlantı sunmasına izin ver." @@ -1858,11 +1868,11 @@ tr_TR: log_personal_messages_views: "Diğer kullanıcılar / gruplar için Yönetici tarafından özel ileti görünümlerini günlüğe kaydedin." ignored_users_count_message_threshold: "Belirli bir kullanıcı diğer birçok kullanıcı tarafından göz ardı edilirse moderatörlere bildirin." ignored_users_message_gap_days: "Diğerleri tarafından görmezden gelinen bir kullanıcı hakkında moderatörlere tekrar bildirimde bulunmadan önce ne kadar bekleyeceği." - clean_up_inactive_users_after_days: "Etkin olmayan bir kullanıcının (gönderiler olmadan 0 güven seviyesi) kaldırılmasından önceki gün sayısı. Temizlemeyi devre dışı bırakmak için 0 olarak ayarlayın." + clean_up_inactive_users_after_days: "Etkin olmayan bir kullanıcının (gönderiler olmadan 0 güven düzeyi) kaldırılmasından önceki gün sayısı. Temizlemeyi devre dışı bırakmak için 0 olarak ayarlayın." user_selected_primary_groups: "Kullanıcıların kendi birincil gruplarını ayarlamalarına izin ver" allowed_user_website_domains: "Kullanıcı web sitesi bu alanlara karşı doğrulanacak. Sınırlandırılmış liste." allow_profile_backgrounds: "Kullanıcıların profillerine arkaplan eklemesine izin ver." - sequential_replies_threshold: "Kullanıcının arka arkaya çok fazla cevap gönderdiğine dair uyarı alması için, kullanıcının bir konuda ve bir satırda yapması gereken gönderi sayısı." + sequential_replies_threshold: "Kullanıcının arka arkaya çok fazla yanıt gönderdiğine dair uyarı alması için kullanıcının bir konuda ve bir satırda yapması gereken gönderi sayısı." get_a_room_threshold: "Bir kullanıcının uyarılmadan önce aynı kişi ve aynı konuyla yapması gereken gönderi sayısı." enable_mobile_theme: "Mobil cihazlar mobil uyumlu temayı kullanır, dilerse masaüstü görünüme geçebilirler. Eğer özel, duyarlı bir biçim kullanıyorsanız bunu devre dışı bırakın." dominating_topic_minimum_percent: "Konuyu domine ettiğine dair uyarı almadan önce konudaki gönderilerin yüzde kaçının kullanıcıya ait olması gerekir." @@ -1876,10 +1886,10 @@ tr_TR: notification_consolidation_threshold: "Bildirimler tek bir konsolide toplanmadan önce alınan beğeni veya üyelik talebi bildirimlerinin sayısı. Devre dışı bırakmak için 0 olarak ayarlayın." likes_notification_consolidation_window_mins: "Beğenilen bildirimlerin eşiğe ulaşıldığında tek bir bildirimde birleştirildiği dakika cinsinden süre. Eşik değeri 'SiteSetting.notification_consolidation_threshold' aracılığıyla yapılandırılabilir." automatically_unpin_topics: "Kullanıcı sayfa sonuna eriştiğinde tutturulmuş konuları otomatik olarak sayfadan ayır." - read_time_word_count: "Tahmini okuma süresini hesaplamak için dakika başına kelime sayısı." + read_time_word_count: "Tahmini okuma süresini hesaplamak için dakika başına sözcük sayısı." topic_page_title_includes_category: "Konu sayfası başlık etiketi kategori adını içerir." - native_app_install_banner_ios: "Normal kullanıcılara (güven seviyesi 1 ve üstü) iOS cihazlarda DiscourseHub uygulama başlığını görüntüler." - native_app_install_banner_android: "Normal kullanıcılara (güven seviyesi 1 ve üstü) Android cihazlarda DiscourseHub uygulama başlığını görüntüler." + native_app_install_banner_ios: "Normal kullanıcılara (güven düzeyi 1 ve üstü) iOS aygıtlarda DiscourseHub uygulama başlığını görüntüler." + native_app_install_banner_android: "Normal kullanıcılara (güven düzeyi 1 ve üstü) Android aygıtlarda DiscourseHub uygulama başlığını görüntüler." app_association_android: "Google'ın Dijital Varlık Bağlantıları API'sı için kullanılan well-known/assetlinks.json son noktanın içeriği." app_association_ios: "Bu site ile iOS uygulamaları arasında Evrensel Bağlantılar oluşturmak için kullanılan apple-app-site-ilişkilendirme son noktanın içeriği." share_anonymized_statistics: "Anonimleştirilmiş kullanım istatistiklerini paylaşın." @@ -1890,9 +1900,9 @@ tr_TR: full_name_required: "Kullanıcı profili için tam ad zorunlu bir alandır." enable_names: "Kullanıcıların tam adlarını profillerde, kullanıcı kartlarında ve e-postalarda göster. Tam adların hiç bir yerde görünmemesi için devre dışı bırak." display_name_on_posts: "Gönderilerde @kullanıcıadı'na ek olarak kullanıcının tam adını da göster." - show_time_gap_days: "İki gönderinin tarihleri arasında bu kadar gün farkı varsa, konuda zaman aralığına yer ver." - short_progress_text_threshold: "Bir konudaki gönderi sayısı bu sayının üzerine çıktığında, ilerleme çubuğunda sadece şu anki gönderi sayısını göster. İlerleme çubuğunun kalınlığını değiştirirseniz, bu değeri de değiştirmeniz gerekebilir." - warn_reviving_old_topic_age: "Herhangi bir kullanıcı, son cevabın burada belirtilen gün sayısından daha önce yazıldığı bir konuya cevap yazmaya başladığında, bir uyarı iletisi çıkacak. Bu özelliği devre dışı bırakmak için 0 girin." + show_time_gap_days: "İki gönderinin tarihleri arasında bu kadar gün farkı varsa konuda zaman aralığına yer ver." + short_progress_text_threshold: "Bir konudaki gönderi sayısı bu sayının üzerine çıktığında, ilerleme çubuğunda sadece şu anki gönderi sayısını göster. İlerleme çubuğunun kalınlığını değiştirirseniz bu değeri de değiştirmeniz gerekebilir." + warn_reviving_old_topic_age: "Herhangi bir kullanıcı, son yanıtın burada belirtilen gün sayısından daha önce yazıldığı bir konuya cevap yazmaya başladığında, bir uyarı iletisi çıkacak. Bu özelliği devre dışı bırakmak için 0 girin." autohighlight_all_code: "Tüm önceden biçimlendirilen kod parçalarına, açıkça dil seçimi yapılmamış olsa da, zorla kod vurgulaması uygula." highlighted_languages: "Sözdizimi vurgulama kuralları dahil. (Uyarı: çok fazla dil dahil etmek performansı etkileyebilir) bkz: demo için https://highlightjs.org/static/demo" embed_any_origin: "Kaynağı ne olursa olsun gömülebilir içeriğe izin ver. Bu, statik HTML'ye sahip mobil uygulamalar için gereklidir." @@ -1904,8 +1914,8 @@ tr_TR: allowed_href_schemes: "Http ve https'ye ek olarak bağlantılarda şemalara izin verilir." embed_post_limit: "Yerleştirilecek en fazla gönderi sayısı." embed_username_required: "Konu oluşturmak için kullanıcı adı gereklidir." - notify_about_flags_after: "Bu saatten sonra ele alınmayan raporlar varsa, moderatörlere özel bir mesaj gönderin. Devre dışı bırakmak için 0 olarak ayarlayın." - show_create_topics_notice: "Eğer sitede herkese açık konu sayısı 5'den az ise, yöneticiden yeni konular oluşturmasını isteyen bir uyarı iletisi göster." + notify_about_flags_after: "Bu saatten sonra ele alınmayan raporlar varsa moderatörlere özel bir mesaj gönderin. Devre dışı bırakmak için 0 olarak ayarlayın." + show_create_topics_notice: "Eğer sitede herkese açık konu sayısı 5'den az ise yöneticiden yeni konular oluşturmasını isteyen bir uyarı iletisi göster." delete_drafts_older_than_n_days: "(n) günden eski taslakları sil." bootstrap_mode_min_users: "bootstrap modunun edilgen olması için gereken en az kullanıcı sayısı (edilgen bırakmak için 0 yapın)" prevent_anons_from_downloading_files: "Anonim kullanıcıların ekleri indirmesini önle." @@ -1916,39 +1926,40 @@ tr_TR: emoji_autocomplete_min_chars: "Otomatik tamamlama emoji açılır penceresini tetiklemek için gereken minimum karakter sayısı" enable_inline_emoji_translation: "Satır içi emojiler için çeviriyi etkinleştirir (daha önce boşluk veya noktalama işareti olmadan)" approve_post_count: "Yeni veya standart kullanıcı tarafından onaylanması gereken gönderi sayısı" - approve_unless_trust_level: "Bu güven seviyesi altındaki kullanıcılardan gelen gönderilerin onaylanması gerekir" + approve_unless_trust_level: "Bu güven düzeyi altındaki kullanıcılardan gelen gönderilerin onaylanması gerekir" approve_new_topics_unless_trust_level: "Bu güven düzeyinin altındaki kullanıcılar için yeni konular onaylanmalıdır" approve_unless_staged: "Aşamalı kullanıcılar için yeni konular ve gönderiler onaylanmalıdır" - notify_about_queued_posts_after: "Bu kadar saat geçmesine rağmen hala incelenmemiş gönderiler varsa, tüm moderatörlere bir bildirim gönderin. Bu bildirimleri devre dışı bırakmak için 0 olarak ayarlayın." + notify_about_queued_posts_after: "Bu kadar saat geçmesine rağmen hala incelenmemiş gönderiler varsa tüm moderatörlere bir bildirim gönderin. Bu bildirimleri devre dışı bırakmak için 0 olarak ayarlayın." auto_close_messages_post_count: "Otomatik olarak kapatılmadan önce bir mesajda izin verilen maksimum gönderi sayısı (devre dışı bırakmak için 0)" auto_close_topics_post_count: "Otomatik olarak kapatılmadan önce bir konuda izin verilen maksimum gönderi sayısı (devre dışı bırakmak için 0)" code_formatting_style: "Bestecideki kod düğmesi bu kod ayarlama stiline göre varsayılan olacaktır." max_allowed_message_recipients: "Bir mesajda izin verilen maksimum alıcı." - watched_words_regular_expressions: "İzlenen kelimeler düzenli ifadelerdir." + watched_words_regular_expressions: "İzlenen sözcükler düzenli ifadelerdir." enable_diffhtml_preview: "Tam yeniden oluşturma yerine önizlemeyi senkronize etmek için diffHTML kullanan deneysel özellik" enable_fast_edit: "Satır içi düzenlemek için bir yazı metninin küçük bir kısmının seçilebilmesini etkinleştirir." old_post_notice_days: "Yayın bildiriminin eski hale gelmesinden önceki günler" - new_user_notice_tl: "Yeni kullanıcıların gönderilerinin bildirimini görmek için gereken minimum güven seviyesi." - returning_user_notice_tl: "Geri dönen kullanıcıların gönderilerinin bildirimini görmek için gereken minimum güven seviyesi." + new_user_notice_tl: "Yeni kullanıcıların gönderilerinin bildirimini görmek için gereken minimum güven düzeyi." + returning_user_notice_tl: "Geri dönen kullanıcıların gönderilerinin bildirimini görmek için gereken minimum güven düzeyi." returning_users_days: "Bir kullanıcının geri döneceği düşünülmeden önce kaç gün geçmesi gerekir." + review_media_unless_trust_level: "Personel, gömülü medya içeriyorsa daha düşük güven düzeylerine sahip kullanıcıların gönderilerini inceler." blur_tl0_flagged_posts_media: "Potansiyel NSFW içeriğini gizlemek için bayraklanmış gönderilerin içindeki imajları bulanıklaştır." enable_page_publishing: "Personelin, konuları kendi stilleriyle yeni URL'lerde yayınlamasına izin verin." show_published_pages_login_required: "Oturum açma zorunlu olsa dahi anonim kullanıcılar yayınlanan sayfaları görebilir." skip_auto_delete_reply_likes: "Eski yanıtları otomatik olarak silerken, bu sayıda veya daha fazla beğeniye sahip gönderileri silme." default_email_digest_frequency: "Öntanımlı olarak kullanıcılar ne sıklıkla e-posta özeti alacak." default_include_tl0_in_digests: "Yeni kullanıcılardan gelen gönderileri varsayılan olarak özet e-postalara dahil et. Kullanıcılar bunu kendi tercihlerine göre değiştirebilirler." - default_email_level: "Normal konular için varsayılan e-posta bildirim seviyesini ayarlayın." - default_email_messages_level: "Birisi kullanıcıya mesaj gönderdiğinde varsayılan e-posta bildirim seviyesini ayarlayın." + default_email_level: "Normal konular için varsayılan e-posta bildirim düzeyini ayarlayın." + default_email_messages_level: "Birisi kullanıcıya mesaj gönderdiğinde varsayılan e-posta bildirim düzeyini ayarlayın." default_email_mailing_list_mode: "Öntanımlı olarak her yeni gönderi için bir e-posta gönder." default_email_mailing_list_mode_frequency: "Posta listesi modunu etkinleştiren kullanıcılar varsayılan olarak bu e-postaları alır." disable_mailing_list_mode: "Kullanıcıların posta listesi modunu etkinleştirmesine izin verme (posta listesi e-postalarının gönderilmesini engeller.)" default_email_previous_replies: "Varsayılan olarak e-postalara önceki yanıtları dahil et." - default_email_in_reply_to: "Gönderilere gelen cevapların bir örneğini varsayılan olarak e-postaya ekle" + default_email_in_reply_to: "Gönderilere gelen yanıtların bir örneğini varsayılan olarak e-postaya ekle" default_other_new_topic_duration_minutes: "Konunun yeni olarak düşünülmesi için genel öntanımlı koşul." default_other_auto_track_topics_after_msecs: "Bir konunun otomatik olarak takip edilmesi için geçmesi gereken genel öntanımlı zaman." default_other_notification_level_when_replying: "Kullanıcı bir konuya yanıt verdiğinde genel varsayılan bildirim düzeyi." default_other_external_links_in_new_tab: "Harici linkleri, öntanımlı olarak, yeni bir sekmede aç." - default_other_enable_quoting: "Vurgulanmış yazılar için alıntı ile cevaplamayı, öntanımlı olarak, etkinleştir." + default_other_enable_quoting: "Vurgulanmış yazılar için alıntı ile yanıtlamayı öntanımlı olarak etkinleştir." default_other_enable_defer: "Varsayılan olarak erteleme konusu işlevini etkinleştir." default_other_dynamic_favicon: "Tarayıcı simgesinde, öntanımlı olarak, yeni/güncellenmiş konu sayısını göster." default_other_skip_new_user_tips: "Yeni kullanıcı katılımı ipuçlarını ve rozetlerini atlayın." @@ -1971,22 +1982,22 @@ tr_TR: revoke_api_keys_days: "Kullanılmayan bir API anahtarının otomatik olarak iptal edilmesinden önceki gün sayısı (hiçbir zaman için 0 giriniz)" allow_user_api_keys: "Kullanıcı API anahtarlarının oluşturulmasına izin ver" allow_user_api_key_scopes: "Kullanıcı API anahtarları için izin verilen kapsamların listesi" - min_trust_level_for_user_api_key: "Kullanıcı API'si oluşturmak için gereken güven seviyesi" + min_trust_level_for_user_api_key: "Kullanıcı API'si oluşturmak için gereken güven düzeyi" allowed_user_api_auth_redirects: "Kullanıcı API anahtarlarına kimlik doğrulama yönlendirmesi için izin verilen URL. Joker karakter *, herhangi bir bölümüyle eşleşmek için kullanılabilir (örn. www.example.com/*)." allowed_user_api_push_urls: "Sunucu API'na kullanıcı API'ı için izin verilen URL'ler" expire_user_api_keys_days: "Bir kullanıcı API anahtarının otomatik olarak sona ermesinden önceki gün sayısı (hiçbir zaman 0)" tagging_enabled: "Konularda etiketleri etkinleştirin?" - min_trust_to_create_tag: "Yeni bir etiket oluşturmak için gereken en az güven seviyesi." + min_trust_to_create_tag: "Yeni bir etiket oluşturmak için gereken en az güven düzeyi." max_tags_per_topic: "Bir konuya eklenebilecek en fazla etiket." - max_tag_length: "Bir etiket isminde kullanılabilecek en fazla karakter sayısı." + max_tag_length: "Bir etiket adında kullanılabilecek en fazla karakter sayısı." max_tag_search_results: "Etiketler için arama yapılırken gösterilecek en fazla sonuç." max_tags_in_filter_list: "Filtre açılır menüsünde gösterilecek maksimum etiket sayısı. En çok kullanılan etiketler gösterilir." - tags_sort_alphabetically: "Etiketleri harf sırasına göre sırala. Öntanımlı olarak gözdelik seviyesine göre gösterilir." + tags_sort_alphabetically: "Etiketleri harf sırasına göre sırala. Öntanımlı olarak gözdelik düzeyine göre gösterilir." tags_listed_by_group: "Etiketleri Etiketler sayfasında etiket grubuna göre listeleyin." tag_style: "Etiket rozetleri için görsel biçim." allow_staff_to_tag_pms: "Yetkili üyelerin herhangi bir kişisel mesajı etiketlemesine izin ver" - min_trust_level_to_tag_topics: "Konulara etiket eklemek için gereken en az güven seviyesi." - suppress_overlapping_tags_in_list: "Eğer etiketler konu ismi içerisinde tam kelime olarak bulunuyorsa, etiketi gösterme" + min_trust_level_to_tag_topics: "Konulara etiket eklemek için gereken en az güven düzeyi." + suppress_overlapping_tags_in_list: "Eğer etiketler konu adı içerisinde tam sözcük olarak bulunuyorsa etiketi gösterme" remove_muted_tags_from_latest: "En son ki konular listesinde yalnızca sessiz etiketlerle etiketlenmiş konuları gösterme." force_lowercase_tags: "Tüm yeni etiketleri tamamen küçük harf olmaya zorlayın." company_name: "Şirket Adı" @@ -2115,29 +2126,29 @@ tr_TR: invalid: "geçersiz karakterler barındırıyor" topic_statuses: autoclosed_message_max_posts: - one: "Bu ileti %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı." - other: "Bu ileti %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı." + one: "Bu ileti %{count} olan en fazla yanıt limitini aştığı için otomatik olarak kapatıldı." + other: "Bu ileti %{count} olan en fazla yanıt limitini aştığı için otomatik olarak kapatıldı." autoclosed_topic_max_posts: - one: "Bu konu %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı." - other: "Bu konu %{count} olan en fazla cevap limitini aştığı için otomatik olarak kapatıldı." + one: "Bu konu %{count} olan en fazla yanıt limitini aştığı için otomatik olarak kapatıldı." + other: "Bu konu %{count} olan en fazla yanıt limitini aştığı için otomatik olarak kapatıldı." autoclosed_enabled_days: - one: "Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." - other: "Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." + one: "Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." + other: "Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." autoclosed_enabled_hours: - one: "%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." - other: "%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." + one: "%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." + other: "%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." autoclosed_enabled_minutes: - one: "%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." - other: "%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." + one: "%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." + other: "%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." autoclosed_enabled_lastpost_days: - one: "Bu konu son cevaptan %{count} gün sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." - other: "Bu konu son cevaptan %{count} gün sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." + one: "Bu konu son yanıttan %{count} gün sonra otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." + other: "Bu konu son yanıttan %{count} gün sonra otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." autoclosed_enabled_lastpost_hours: - one: "Bu konu son cevaptan %{count} saat sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." - other: "Bu konu son cevaptan %{count} saat sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." + one: "Bu konu son yanıttan %{count} saat sonra otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." + other: "Bu konu son yanıttan %{count} saat sonra otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." autoclosed_enabled_lastpost_minutes: - one: "Bu konu son cevaptan %{count} dakika sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." - other: "Bu konu son cevaptan %{count} dakika sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor." + one: "Bu konu son yanıttan %{count} dakika sonra otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." + other: "Bu konu son yanıttan %{count} dakika sonra otomatik olarak kapatıldı. Yeni yanıt girilmesine izin verilmiyor." autoclosed_disabled_days: one: "Bu konu %{count} gün sonra otomatik olarak açıldı." other: "Bu konu %{count} gün sonra otomatik olarak açıldı." @@ -2156,8 +2167,8 @@ tr_TR: autoclosed_disabled_lastpost_minutes: one: "Bu konu son yanıttan sonra otomatik olarak %{count} dakika içinde açıldı." other: "Bu konu son yanıttan sonra %{count} dakika içinde otomatik olarak açıldı." - autoclosed_disabled: "Konu şimdi açıldı. Yeni cevaplara izin var." - autoclosed_disabled_lastpost: "Konu şimdi açıldı. Yeni cevaplara izin var." + autoclosed_disabled: "Konu şimdi açık. Yeni yanıtlara izin var." + autoclosed_disabled_lastpost: "Konu şimdi açık. Yeni yanıtlara izin var." auto_deleted_by_timer: "Zamanlayıcı tarafından otomatik olarak silinir." login: invalid_second_factor_method: "Seçilen iki faktör yöntemi geçersiz." @@ -2174,7 +2185,7 @@ tr_TR: incorrect_password: "Yanlış Parola" wait_approval: "Kayıt olduğunuz için teşekkürler. Hesabınız onaylandığında sizi haberdar edeceğiz." active: "Hesabınız etkinleştirildi ve kullanıma hazır." - activate_email: "

Neredeyse bitti! %{email} adresine bir etkinleştirme postası gönderdik. Hesabınızı etkinleştirmek için lütfen postadaki talimatları uygulayın.

Gelmezse, spam klasörünüzü kontrol edin.

" + activate_email: "

Neredeyse bitti! %{email} adresine bir etkinleştirme postası gönderdik. Hesabınızı etkinleştirmek için lütfen postadaki talimatları uygulayın.

Gelmezse spam klasörünüzü kontrol edin.

" not_activated: "Henüz giriş yapamazsınız. Size bir etkinleştirme e-postası gönderdik. Hesabınızı etkinleştirmek için lütfen e-postadaki yönlendirmeleri takip edin." not_allowed_from_ip_address: "Bu IP adresinden %{username} kullanıcı adı ile giriş yapamazsınız." admin_not_allowed_from_ip_address: "Bu IP adresinden admin olarak giriş yapamazsınız." @@ -2196,7 +2207,7 @@ tr_TR: authenticator_error_no_valid_email: "%{account} ile ilişkili hiçbir e-posta adresine izin verilmiyor. Hesabınızı farklı bir e-posta adresiyle yapılandırmanız gerekebilir." new_registrations_disabled: "Şu an yeni hesap oluşturulamıyor." password_too_long: "Parolalar en fazla 200 karakter olabilir." - email_too_long: "Vermiş olduğun e-posta çok uzun. E-posta kutusu isimleri 254, alan adı isimleri ise 253 karakterden daha uzun olamaz." + email_too_long: "Vermiş olduğunuz e-posta çok uzun. E-posta kutusu adları 254, alan adı isimleri ise 253 karakterden daha uzun olamaz." wrong_invite_code: "Girdiğiniz davet kodu yanlıştı." reserved_username: "Bu kullanıcı adını kullanamazsın." missing_user_field: "Kullanıcı alanlarının tamamını doldurmadınız" @@ -2209,7 +2220,7 @@ tr_TR: second_factor_backup_title: "İki Faktörlü Oturum Açma Yedekleme Kodu" invalid_second_factor_code: "Geçersiz kimlik doğrulama kodu. Her kod yalnızca bir kez kullanılabilir." invalid_security_key: "Geçersiz güvenlik anahtarı." - missing_second_factor_name: "Lütfen bir isim belirtin." + missing_second_factor_name: "Lütfen bir ad belirtin." missing_second_factor_code: "Lütfen bir kod girin." second_factor_toggle: totp: "Bunun yerine bir kimlik doğrulama uygulaması veya güvenlik anahtarı kullanın" @@ -2254,7 +2265,7 @@ tr_TR: invalid: "geçersiz." not_allowed: "için o e-posta sağlayıcısına izin verilmiyor. Lütfen başka bir e-posta adresi kullanın." blocked: "için izin yok." - revoked: "%{date} tarihine kadar '%{email}' e e-posta göndermeyecek." + revoked: "%{date} tarihine kadar '%{email}' adresine e-posta göndermeyecek." does_not_exist: "Yok" ip_address: blocked: "Mevcut IP adresiniz üzerinden yeni kayıt işlemine izin verilmiyor." @@ -2287,79 +2298,27 @@ tr_TR: subject_template: "%{site_title} üzerinden daha fazla e-posta güncellemesi almak istemediğinizi onaylayın" text_body_template: | Birisi (galiba siz?) bundan sonra %{site_domain_name} adresinden daha fazla e-posta bildirimi almamak için istekte bulundu. - Eğer bunu onaylıyorsanız, lütfen bağlantıya tıklayın: + Eğer bunu onaylıyorsanız lütfen bağlantıya tıklayın: %{confirm_unsubscribe_link} - Eğer e-posta bildirimlerini almaya devam etmek istiyorsanız, bu e-postayı görmezden gelin. + Eğer e-posta bildirimlerini almaya devam etmek istiyorsanız bu e-postayı görmezden gelebilirsiniz. invite_mailer: title: "Posta göndericisini davet et" - subject_template: "%{inviter_name} sizi %{site_domain_name} üzerindeki '%{topic_title}' davet etti" - text_body_template: | - %{inviter_name}sizi bir tartışmaya davet etti - - >**%{topic_title}** - > - >%{topic_excerpt} - - burada - - >%{site_title}--%{site_description} - - Eğer ilgileniyorsanız, aşağıdaki linke tıklayın: - - %{invite_link} + subject_template: "%{inviter_name}, sizi %{site_domain_name} üzerindeki '%{topic_title}' konusuna davet etti" + text_body_template: "%{inviter_name}, sizi\n\n> %{site_title}--%{site_description} \n\nsitesinde bulunan\n\n>**%{topic_title}**\n>\n>%{topic_excerpt}\n\ntartışmasına davet etti\n\nEğer ilgileniyorsanız aşağıdaki bağlantıya tıklayın:\n\n%{invite_link}\n" custom_invite_mailer: title: "Posta göndericisini özelleştirilmiş davet et" - subject_template: "%{inviter_name} sizi %{site_domain_name} üzerindeki '%{topic_title}' davet etti" - text_body_template: | - %{inviter_name} sizi bir tartışmaya davet etti - - >**%{topic_title}** - > - >%{topic_excerpt} - - burada - - >%{site_title}--%{site_description} - - Bu not ile - - >%{user_custom_message} - - Eğer ilgileniyorsanız, aşağıdaki linke tıklayın: - - %{invite_link} + subject_template: "%{inviter_name}, sizi %{site_domain_name} üzerindeki '%{topic_title}' konusuna davet etti" + text_body_template: "%{inviter_name}, sizi\n\n> %{site_title}--%{site_description} \n\nsitesinde bulunan\n\n>**%{topic_title}**\n>\n>%{topic_excerpt}\n\ntartışmasına davet etti ve bu notu ekledi:\n\n> %{user_custom_message}\n\nEğer ilgileniyorsanız aşağıdaki bağlantıya tıklayın:\n\n%{invite_link}\n" invite_forum_mailer: title: "Forum posta göndericisini davet et" subject_template: "%{inviter_name} sizi %{site_domain_name} katılmaya davet etti" - text_body_template: | - %{inviter_name}sizi katılmaya davet etti - - >**%{site_title}** - > - >%{site_description} - - Eğer ilgileniyorsanız, aşağıdaki linke tıklayın: - - %{invite_link} + text_body_template: "%{inviter_name}, sizi\n\n> **%{site_title}**\n>\n>%{site_description} \n\nsitesine davet etti.\n\nEğer ilgileniyorsanız aşağıdaki bağlantıya tıklayın:\n\n%{invite_link}\n" custom_invite_forum_mailer: title: "Forum posta göndericisini özelleştirilmiş davet et" subject_template: "%{inviter_name} sizi %{site_domain_name} katılmaya davet etti" - text_body_template: | - %{inviter_name}sizi katılmaya davet etti - - >**%{site_title}** - > - >%{site_description} - - bu not ile - - >%{user_custom_message} - - Eğer ilgileniyorsanız, aşağıdaki linke tıklayın: - - %{invite_link} + text_body_template: "%{inviter_name}, sizi\n\n> **%{site_title}**\n>\n>%{site_description} \n\nsitesine davet etti ve bu notu ekledi:\n\n> %{user_custom_message}\n\nEğer ilgileniyorsanız aşağıdaki bağlantıya tıklayın:\n\n%{invite_link}\n" invite_password_instructions: title: "Parola Talimatlarını davet et" subject_template: "%{site_name} hesabınız için parola oluşturun" @@ -2425,7 +2384,7 @@ tr_TR: Gönderiniz gizlenmeden önce topluluk tarafından raporlandı. Lütfen, bu geri bildirimler doğrultusunda gönderinizi nasıl düzelteceğinizi düşünün. **Gönderinizi %{edit_delay} dakika sonra düzenleyebilirsiniz, otomatik olarak tekrar yayınlanacaktır.** - Ancak, eğer gönderiniz kullanıcılar tarafından ikinci kere gizlenirse, görevliler tarafından incelenene kadar gizli kalacaktır. + Ancak, eğer gönderiniz kullanıcılar tarafından ikinci kere gizlenirse görevliler tarafından incelenene kadar gizli kalacaktır. Daha fazla bilgi için, lütfen [topluluk yönergelerine bakın](%{base_url}/guidelines). post_hidden_again: @@ -2490,9 +2449,9 @@ tr_TR: Ayrıntılar için lütfen [topluluk yönergelerimizi](%{base_url}/guidelines) inceleyin. usage_tips: text_body_template: | - Yeni bir kullanıcı olarak başlamak için birkaç küçük ipucu,[bu blog gönderisini inceleyin](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/). + Yeni bir kullanıcı olarak başlamak için birkaç küçük ipucu, [bu blog gönderisini inceleyin](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/). - Buraya katılımda bulunduğunuz sürece,sizi bileceğiz,ve geçici yeni kullanıcı limitleriniz genişletilecek.Zaman içinde[güven seviyeleri] kazanacaksınız(https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) bunlarda topluluğumuzu geliştirmeye yardım etmeniz için özel özellikler içerecek. + Buraya katılımda bulunduğunuz sürece, sizi bileceğiz ve geçici yeni kullanıcı limitleriniz genişletilecek. Zaman içinde [güven seviyeleri] kazanacaksınız(https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) bunlar da topluluğumuzu geliştirmeye yardım etmeniz için özel özellikler içerecek. welcome_user: title: "Hoşgeldiniz Kullanıcı" subject_template: "%{site_name} topluluğuna hoş geldiniz!" @@ -2517,16 +2476,16 @@ tr_TR: text_body_template: | Bir yetkili tarafından size %{role} statüsü verildi. - %{role} olarak artık yönetici arayüzüne erişiminiz var. + %{role} olarak artık yönetici arayüzüne erişiminiz var. - Büyük güç büyük sorumluluk getirir. Denetleme konusunda yeniyseniz, lütfen [Denetleme Kılavuzu] 'na bakın (https://meta.discourse.org/t/discourse-moderation-guide/63116). + Büyük güç büyük sorumluluk getirir. Denetleme konusunda yeniyseniz lütfen [Denetleme Kılavuzu] 'na bakın (https://meta.discourse.org/t/discourse-moderation-guide/63116). welcome_invite: title: "Hoşgeldiniz Davet Edin" subject_template: "%{site_name} topluluğuna hoş geldiniz!" text_body_template: | %{site_name} davetiyenizi onayladığınız için teşekkürler -- hoş geldiniz! - - Sizin için yeni bir hesap oluşturduk **%{username}**. [kullanıcı profilinizi][prefs] ziyaret ederek isminizi veya parolanızı değiştirebilirsiniz. + - Sizin için yeni bir hesap oluşturduk **%{username}**. [kullanıcı profilinizi][prefs] ziyaret ederek adınızı veya parolanızı değiştirebilirsiniz. Giriş yaptığınızda, lütfen **orijinal davetteki aynı e-mail hesabını kullanın** — aksi halde sizin siz olduğunuzu anlayamayız! @@ -2538,7 +2497,7 @@ tr_TR: [prefs] :%{user_preferences_url} tl2_promotion_message: - subject_template: "Güven seviyesi terfiniz için tebrikler!" + subject_template: "Güven düzeyi terfiniz için tebrikler!" text_body_template: | Sizi yeni bir [güven düzeyine](https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) yükselttik! @@ -2612,18 +2571,18 @@ tr_TR: Yukarıda ki indirme bağlantısı 48 saatliğine geçerli olucaktır. - Veri zip arşivi olarak sıkıştırıldı. Eğer açtığınızda arşiv kendini çıkartmazsa, burada tavsiye edileni kullanın. https://www.7-zip.org/ + Veri zip arşivi olarak sıkıştırıldı. Eğer açtığınızda arşiv kendini çıkartmazsa burada tavsiye edileni kullanın. https://www.7-zip.org/ csv_export_failed: title: "CSV Dışa Aktarma Başarısız" subject_template: "Dışarı veri aktarımı başarısız oldu" text_body_template: "Üzgünüz, dışarı veri aktarımı başarısız oldu. Lütfen kayıtları inceleyin veya [bir yetkili ile iletişime geçin](%{base_url}/about)" email_reject_insufficient_trust_level: - title: "E-posta Reddedildi Yetersiz Güven Seviyesi" - subject_template: "[%{email_prefix}] E-posta sorunu -- Yetersiz Güven Seviyesi" + title: "E-posta Reddedildi Yetersiz Güven Düzeyi" + subject_template: "[%{email_prefix}] E-posta sorunu -- Yetersiz Güven Düzeyi" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. + Üzgünüz; ancak %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. - Bu e-posta adresine yeni gönderiler oluşturmanız için, hesabınız yeterli güven seviyesine sahip değil. Yanlışlık olduğunu düşünüyorsanız, [bir görevli ile iletişime geçin](%{base_url}/about). + Bu e-posta adresine yeni gönderiler oluşturmanız için, hesabınız yeterli güven düzeyine sahip değil. Yanlışlık olduğunu düşünüyorsanız [bir görevli ile iletişime geçin](%{base_url}/about). email_reject_user_not_found: title: "E-posta Reddedildi Kullanıcı Bulunamadı" subject_template: "[%{email_prefix}] E-posta sorunu -- Kullanıcı Bulunamadı" @@ -2661,39 +2620,39 @@ tr_TR: Bu e-mail adresiyle ilişkili hesabınız susturulmuş. email_reject_reply_user_not_matching: title: "E-posta Reddedildi Kullanıcı Eşleşmiyor" - subject_template: "[%{email_prefix}] E-posta sorunu - Beklenmeyen Cevap Adresi" + subject_template: "[%{email_prefix}] E-posta sorunu - Beklenmeyen Yanıt Adresi" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) göndermeye çalıştığını email başarısız oldu. + Üzgünüz; ancak %{destination} (titled %{former_title}) göndermeye çalıştığınız e-posta başarısız oldu. - Cevabınız bizim beklediğimizden başka bir e-mail hesabıyla gönderilmiş,böylece aynı kişi olduğundan emin olamadık. Başka bir email adresinden göndermeyi deneyin ya da [bir görevli ile iletişime geçin](%{base_url}/about). + Yanıtınız bizim beklediğimizden başka bir e-posta hesabıyla gönderilmiş, bu yüzden aynı kişi olduğundan emin olamadık. Başka bir e-posta adresinden göndermeyi deneyin veya [bir görevli ile iletişime geçin](%{base_url}/about). email_reject_empty: title: "E-posta Reddedildi 'Boş'" subject_template: "[%{email_prefix}] E-posta sorunu - İçerik Yok" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. + Üzgünüz; ancak %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. - E-postada herhangi bir cevap bulamadık. + E-postanızda herhangi bir yanıt bulamadık. - Eğer bu iletiyi alıyorsanız ve cevap eklediyseniz, daha basit bir biçimleme ile yeniden deneyin. + Eğer bu iletiyi alıyorsanız ve yanıt eklediyseniz daha basit bir biçimleme ile yeniden deneyin. email_reject_parsing: title: "E-posta Reddedildi Ayrıştırma" subject_template: "[%{email_prefix}] E-posta sorunu - İçerik Tanınmadı" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başırısız oldu. E-postada herhangi bir cevap bulamadık. **Cevabınızın e-posta'nın en üstünde yer aldığından emin olun** -- aralardaki cevapları işleyemiyoruz. + Üzgünüz; ancak %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. E-postada herhangi bir yanıt bulamadık. **Yanıtınızın e-posta'nın en üstünde yer aldığından emin olun** -- aralardaki yanıtları işleyemiyoruz. email_reject_invalid_access: title: "E-posta Reddedildi Geçersiz Erişim" subject_template: "[%{email_prefix}] E-posta sorunu - Geçersiz Erişim" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. + Üzgünüz; ancak %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. - Hesabınız o kategoride yeni konu oluşturabilmeniz için gereken ayrıcalıklara sahip değil. Yanlışlık olduğunu düşünüyorsanız, [bir görevli ile iletişime geçin](%{base_url}/about). + Hesabınız o kategoride yeni konu oluşturabilmeniz için gereken ayrıcalıklara sahip değil. Yanlışlık olduğunu düşünüyorsanız [bir görevli ile iletişime geçin](%{base_url}/about). email_reject_strangers_not_allowed: title: "E-posta Reddedildi Yabancılara İzin Verilmiyor" subject_template: "[%{email_prefix}] E-posta sorunu - Geçersiz Erişim" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. + Üzgünüz; ancak %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. - E-posta gönderdiğiniz kategori sadece geçerli hesaba sahip ve e-posta adresleri bilinen kullanıcılar tarafından cevaplanabiliyor. Yanlışlık olduğunu düşünüyorsanız, [bir görevli ile iletişime geçin](%{base_url}/about). + E-posta gönderdiğiniz kategori sadece geçerli hesaba sahip ve e-posta adresleri bilinen kullanıcılar tarafından yanıtlanabiliyor. Yanlışlık olduğunu düşünüyorsanız [bir görevli ile iletişime geçin](%{base_url}/about). email_reject_invalid_post: title: "E-posta Reddedildi Geçersiz Gönderi" subject_template: "[%{email_prefix}] E-posta sorunu - Gönderim hatası" @@ -2711,15 +2670,15 @@ tr_TR: %{post_error} - Sorunu düzeltebilirseniz, lütfen tekrar deneyin. + Sorunu düzeltebilirseniz lütfen tekrar deneyin. date_invalid: "Gönderi oluşturma tarihi bulunamadı. E-postada bir Tarih: başlığı eksik mi?" email_reject_post_too_short: title: "E-posta Reddedildi Gönderi Çok Kısa" subject_template: "[%{email_prefix}] E-posta sorunu - Gönderi çok kısa" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başırısız oldu + Üzgünüz; ancak %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu - Daha derinlemesine konuşmaları desteklemek için, çok kısa yanıtlara izin verilmez. Lütfen en az %{count}karakterle cevap verebilir misin? Alternatif olarak, "+1" ile yanıt vererek birr e-postayı beğenebilirsiniz. + Daha derinlemesine konuşmaları desteklemek için, çok kısa yanıtlara izin verilmez. Lütfen en az %{count} karakterle bir yanıt girin. Alternatif olarak, "+1" yanıtları ile bir e-postayı beğenebilirsiniz. email_reject_invalid_post_action: title: "E-posta Reddedildi Geçersiz Gönderi İşlemi" subject_template: "[%{email_prefix}] E-posta sorunu - Geçersiz gönderi işleme" @@ -2728,12 +2687,12 @@ tr_TR: Gönderi işlemi tanınamadı. Lütfen tekrar deneyin veya devam ederse web sitesi üzerinden gönderi gönderin. email_reject_reply_key: - title: "E-posta Reddedildi Cevaplama Anahtarı" + title: "E-posta Reddedildi Yanıtlama Anahtarı" subject_template: "[%{email_prefix}] E-posta sorunu - Bilinmeyen Cevap Anahtarı" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. + Üzgünüz; ancak %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. - Cevap anahtarı geçersiz ya da bulunamıyor, bu nedenle de bu mesajın neye cevaben gönderildiğini bilemiyoruz. [Bir görevli ile iletişime geçin](%{base_url}/about). + Yanıt anahtarı geçersiz veya bulunamıyor, bu nedenle de bu mesajın neye yanıt olarak gönderildiğini bilemiyoruz. [Bir görevli ile iletişime geçin](%{base_url}/about). email_reject_bad_destination_address: title: "E-posta Reddedildi Sorunlu Alıcı Adresi" subject_template: "[%{email_prefix}] E-posta sorunu - Bilinmeyen: Adres" @@ -2760,23 +2719,23 @@ tr_TR: title: "E-posta Reddedildi Konu Bulunamadı" subject_template: "[%{email_prefix}] E-posta sorunu - Konu Bulunamadı" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermek istediğiniz e-posta başarısız oldu. + Üzgünüz; ancak %{destination} (titled %{former_title}) adresine göndermek istediğiniz e-posta başarısız oldu. - Yanıtlamaya çalıştığınız konu bulunamadı, silinmiş olabilir. Yanlışlık olduğunu düşünüyorsanız, [bir görevli ile iletişime geçin](%{base_url}/about). + Yanıtlamaya çalıştığınız konu bulunamadı, silinmiş olabilir. Yanlışlık olduğunu düşünüyorsanız [bir görevli ile iletişime geçin](%{base_url}/about). email_reject_topic_closed: title: "E-posta Reddedildi Konu Kapatıldı" subject_template: "[%{email_prefix}] E-posta sorunu - Konu Kapatıldı" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermek istediğiniz e-posta başarısız oldu. + Üzgünüz; ancak %{destination} (titled %{former_title}) adresine göndermek istediğiniz e-posta başarısız oldu. - Yanıtlamaya çalıştığınız konu kapatılmış. Yanlışlık olduğunu düşünüyorsanız, [bir görevli ile iletişime geçin](%{base_url}/about). + Yanıtlamaya çalıştığınız konu kapatılmış. Yanlışlık olduğunu düşünüyorsanız [bir görevli ile iletişime geçin](%{base_url}/about). email_reject_auto_generated: title: "E-posta Reddedildi Otomatik Oluşturma" subject_template: "[%{email_prefix}] E-posta sorunu - Otomatik Oluşturulan Yanıt" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) adresine yollamak istediğiniz e-posta başarısız oldu. + Üzgünüz; ancak %{destination} (titled %{former_title}) adresine yollamak istediğiniz e-posta başarısız oldu. - Sizin e-mailiniz "otomatik oluşturma" olarak işaretlenmişti, bunun anlamı bir insan tarafından değil bir bilgisayar tarafından yaratılmış demektir; bu tarz mailleri kabul edemeyiz. Bir hata olduğuna inanıyorsanız,[bir görevli ile iletişime geçin](%{base_url}/about). + Sizin e-postanız "otomatik oluşturma" olarak imlenmiş; bunun anlamı bir insan tarafından değil de bir bilgisayar tarafından yaratılmış anlamına gelir; bu tarz e-postaları kabul edemeyiz. Bir hata olduğuna inanıyorsanız [bir görevli ile iletişime geçin](%{base_url}/about). email_reject_unrecognized_error: title: "E-posta Reddedildi Bilinmeyen Hata" subject_template: "[%{email_prefix}] E-posta sorunu - Bilinmeyen Hata" @@ -2788,36 +2747,36 @@ tr_TR: title: "E-posta Eki Reddedildi" subject_template: "[%{email_prefix}] E-posta sorunu - Ek Reddedildi" text_body_template: | - Maalesef e-mail mesajınızdaki%{destination}(titled %{former_title}) bazı ekler reddedildi. + Ne yazık ki %{destination}(titled %{former_title}) adresine olan e-postanızdaki bazı ekler reddedildi. - Detaylar için; + Ayrıntılar için; %{rejected_errors} - Eğer bir yanlışlık olduğunu düşünüyorsanız,[bir görevli ile iletişime geçin](%{base_url}/about). + Eğer bir yanlışlık olduğunu düşünüyorsanız [bir görevli ile iletişime geçin](%{base_url}/about). email_reject_reply_not_allowed: title: "E-posta Reddedildi Yanıta İzin Verilmiyor" subject_template: "[%{email_prefix}] E-posta sorunu - Yanıta İzin Verilmiyor" text_body_template: | - Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. + Üzgünüz; ancak %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. - Konuyu cevaplamak için gerekli izniniz yok. Yanlışlık olduğunu düşünüyorsanız, [bir görevli ile iletişime geçin](%{base_url}/about). + Konuyu yanıtlamak için gerekli izniniz yok. Yanlışlık olduğunu düşünüyorsanız [bir görevli ile iletişime geçin](%{base_url}/about). email_reject_reply_to_digest: subject_template: "[%{email_prefix}] E-posta sorunu -- Özete Yanıt" text_body_template: | - Üzgünüz ancak %{destination}'a ilettiğiniz (%{former_title} başlıklı) e-posta mesajı gitmedi. + Üzgünüz ancak %{destination} adresine ilettiğiniz (%{former_title} başlıklı) e-posta mesajı gitmedi. Bir özet e-postasını yanıtladınız, ki bu yapılamaz. - Bunun yanlışlıkla olduğunu düşünüyorsanız, [bir personelle iletişime geçin](%{base_url}/hakkında). + Bunun yanlışlıkla olduğunu düşünüyorsanız [bir personelle iletişime geçin](%{base_url}/hakkında). email_error_notification: title: "E-posta Hata Bildirimi" subject_template: "[%{email_prefix}] E-posta sorunu - POP kimlik doğrulama hatası" text_body_template: | Mailler POP sunucusundan çağrılırken bir doğrulama hatası oluştu. - Lütfen, [site ayarlarında](%{base_url}/admin/site_settings/category/email) POP bilgilerinin doğru şekilde düzenlendiğinden emin olun. + Lütfen, [site ayarlarında](%{base_url}/admin/site_settings/category/email) POP bilgilerinin doğru bir biçimde düzenlendiğinden emin olun. - Eğer POP email hesabı için bir web UI varsa,web e giriş yapıp ayarlarınızı kontrol etmeniz gerekebilir. + Eğer POP email hesabı için bir web kullanıcı arabirimi varsa giriş yapıp ayarlarınızı denetlemeniz gerekebilir. email_revoked: title: "E-posta İptal Edildi" subject_template: "E-posta adresiniz doğru mu?" @@ -2852,7 +2811,7 @@ tr_TR: Bu otomatik mesaj %{site_name} tarafından sizi bilgilendirmek için gönderildi. Topluluk tarafından gönderileriniz raporlandığı için gönderileriniz geçici olarak gizlendi. - Tedbir olarak hesabınız sessize alındı. Bir görevli hesabınızı kontrol edene kadar konulara cevap yazamayacak veya yeni konu açamayacaksınız. Verdiğimiz rahatsızlıktan dolayı özür dileriz. + Tedbir olarak hesabınız sessize alındı. Bir görevli hesabınızı kontrol edene kadar konuları yanıtlayamayacak veya yeni konu açamayacaksınız. Verdiğimiz rahatsızlıktan dolayı özür dileriz. Ek bilgi için [topluluk yönergelerine](%{base_url}/guidelines) bakınız. too_many_tl3_flags: @@ -2863,7 +2822,7 @@ tr_TR: Bu otomatik mesaj %{site_name} tarafından sizi bilgilendirmek için gönderildi. Topluluk tarafından gönderileriniz çok fazla raporlandığı için hesabınız beklemeye alındı. - Tedbir olarak hesabınız sessize alındı. Bir görevli hesabınızı kontrol edene kadar konulara cevap yazamayacak veya yeni konu açamayacaksınız. Verdiğimiz rahatsızlıktan dolayı özür dileriz. + Tedbir olarak hesabınız sessize alındı. Bir görevli hesabınızı kontrol edene kadar konuları yanıtlayamayacak veya yeni konu açamayacaksınız. Verdiğimiz rahatsızlıktan dolayı özür dileriz. Ek bilgi için [topluluk yönergelerine](%{base_url}/guidelines) bakınız. silenced_by_staff: @@ -2874,7 +2833,7 @@ tr_TR: Bu otomatik mesaj %{site_name} tarafından sizi bilgilendirmek için gönderildi. Hesabınız tedbiren geçici olarak sessize alındı. - Lütfen gezmeye devam edin fakat bir [görevli](%{base_url}/about) son gönderilerinizi kontrol edene kadar konulara cevap yazamayacak veya konu açamayacaksınız. Verdiğimiz rahatsızlıktan dolayı özür dileriz. + Lütfen gezmeye devam edin fakat bir [görevli](%{base_url}/about) son gönderilerinizi kontrol edene kadar konuları yanıtlayamayacak veya konu açamayacaksınız. Verdiğimiz rahatsızlıktan dolayı özür dileriz. Ek bilgi için [topluluk yönergelerine](%{base_url}/guidelines) bakınız. user_automatically_silenced: @@ -2883,9 +2842,9 @@ tr_TR: text_body_template: | Bu bir otomatik mesajdır. - Yeni kullanıcı [%{username}](%{user_url}) otomatik olarak sessize alındı çünkü birden çok kullanıcı %{username}'nın gönderisini (gönderilerini) raporladı. + Yeni [%{username}](%{user_url}) kullanıcısı otomatik olarak sessize alındı çünkü birden çok kullanıcı %{username} kişisinin gönderisini (gönderilerini) raporladı. - Lütfen [raporları gözden geçirin](%{base_url}/admin/flags). Eğer %{username} yanlışlıkla gönderi atmaktan engellendiyse, susturmayı kaldır butonuna tıklayın [bu kullanıcı için yönetici sayfası](%{user_url}). + Lütfen [raporları gözden geçirin](%{base_url}/admin/flags). Eğer %{username} yanlışlıkla engellendiyse susturmayı kaldır düğmesine tıklayın [bu kullanıcı için yönetici sayfası](%{user_url}). Bu eşik site ayarlarından `silence_new_user` ile değiştirilebilir. spam_post_blocked: @@ -2961,21 +2920,21 @@ tr_TR: email_from: "%{user_name} ile %{site_name}" email_from_without_site: "%{user_name}" user_notifications: - previous_discussion: "Önceki Cevaplar" + previous_discussion: "Önceki Yanıtlar" reached_limit: one: "Uyarı: Günlük maksimum %{count} e-posta göndeririz. Geri alınabilecekleri görmek için siteyi kontrol edin." other: "Uyarı: Günlük maksimum %{count} e-posta gönderebiliriz. Geri alınabilecek e-postaları görmek için siteyi kontrol edin. Ayrıca popüler olduğunuz için teşekkürler!" - in_reply_to: "Cevaben" + in_reply_to: "Yanıt Olarak" unsubscribe: title: "Aboneliği İptal Et" description: "Bu e-postalarla ilgilenmiyor musunuz? Sorun değil! Aşağıya tıklayarak aboneliğinizi hemen iptal edebilirsiniz:" - reply_by_email: "Yanıtlamak için [konuyu ziyaret edin](%{base_url}%{url}) ya da bu e-postaya cevap verin." - reply_by_email_pm: "[Mesaja Git](%{base_url}%{url}) veya %{participants}'a cevap vermek için bu maili yanıtla." - only_reply_by_email: "Cevap vermek için bu e-postayı cevaplayın." - only_reply_by_email_pm: "%{participants}'e cevap vermek için bu maili yanıtla." - visit_link_to_respond: "Cevaplamak için [konuyu ziyaret edin](%{base_url}%{url})." - visit_link_to_respond_pm: "%{participants}'a cevap vermek için [Mesaja Git](%{base_url}%{url})" - reply_above_line: "## Lütfen cevabınızı bu satırın üzerine yazın. ##" + reply_by_email: "Yanıtlamak için [konuyu ziyaret edin](%{base_url}%{url}) veya bu e-postaya cevap verin." + reply_by_email_pm: "[Mesaja Git](%{base_url}%{url}) veya %{participants} kişisini yanıtlamak için bu e-postayı yanıtlayın." + only_reply_by_email: "Yanıt için bu e-postayı yanıtlayın." + only_reply_by_email_pm: "%{participants} kişisini/kişilerini yanıtlamak için bu e-postayı yanıtlayın." + visit_link_to_respond: "Yanıtlamak için [konuyu ziyaret edin](%{base_url}%{url})." + visit_link_to_respond_pm: "%{participants} kişisini/kişilerini yanıtlamak için [Mesaja Git](%{base_url}%{url})." + reply_above_line: "## Lütfen yanıtınızı bu satırın üzerine yazın. ##" posted_by: "%{post_date} tarihinde %{username} tarafından gönderildi" pm_participants: "Katılımcılar: %{participants}" invited_group_to_private_message_body: | @@ -3021,7 +2980,7 @@ tr_TR: %{topic_url} user_invited_to_private_message_pm_group: title: "Kullanıcı PM Grubuna Davet Edildi" - subject_template: "[%{email_prefix}]%{username} %{group_name} tarafından bir mesaja '%{topic_title}' davet edildi." + subject_template: "[%{email_prefix}] %{username} %{group_name} tarafından bir mesaja '%{topic_title}' davet edildi." text_body_template: | %{header_instructions} @@ -3056,7 +3015,7 @@ tr_TR: %{respond_instructions} user_replied: - title: "Kullanıcı Tarafından Cevaplandı" + title: "Kullanıcı Tarafından Yanıtlandı" subject_template: "[%{email_prefix}] %{topic_title}" text_body_template: | %{header_instructions} @@ -3223,13 +3182,13 @@ tr_TR: title: "Bu Hesap Zaten Mevcut" subject_template: "[%{email_prefix}] Hesap zaten mevcut" text_body_template: | - %{site_name}'da bir hesap oluşturmaya çalıştınız veya bir hesabın e-posta adresini %{email} şeklinde değiştirmeye çalıştınız. Ancak, %{email} için bir hesap mevcut. + %{site_name} sitesinde bir hesap oluşturmaya veya bir hesabın e-posta adresini %{email} şeklinde değiştirmeye çalıştınız. Ancak, %{email} için bir hesap mevcut. - Eğer parolanızı unuttuysanız, [şimdi parolanızı sıfırlayın](%{base_url}/password-reset). + Eğer parolanızı unuttuysanız [şimdi parolanızı sıfırlayın](%{base_url}/password-reset). Eğer %{email} için bir hesap oluşturmaya çalışmadıysanız veya e-posta adresini değiştirmeye çalışmadıysanız endişe etmeyin. Güvenli bir şekilde bu mesajı görmezden gelebilirsiniz. - Herhangi bir sorunuz varsa, [güleryüzlü görevlilerimiz ile iletişime geçiniz](%{base_url}/about). + Herhangi bir sorunuz varsa [güleryüzlü görevlilerimiz ile iletişime geçiniz](%{base_url}/about). account_second_factor_disabled: title: "İki Faktörlü Kimlik Doğrulama devre dışı bırakıldı" subject_template: "[%{email_prefix}] İki Faktörlü Kimlik Doğrulaması devre dışı" @@ -3281,11 +3240,11 @@ tr_TR: set_password: title: "Parola Belirle" subject_template: "[%{email_prefix}] Parola Belirle" - text_body_template: "Birisi [%{site_name}] (%{base_url}) hesabınıza bir parola eklemenizi istedi. Alternatif olarak, bu onaylanmış e-posta adresiyle ilişkili desteklenen herhangi bir çevrimiçi hizmeti (Google, Facebook vb.) Kullanarak giriş yapabilirsiniz. \nBu isteği siz yapmadıysanız, bu e-postayı güvenle yok sayabilirsiniz. \nBir parola seçmek için aşağıdaki bağlantıyı tıklayın: %{base_url}/u/password-reset/%{email_token}\n" + text_body_template: "Birisi [%{site_name}] (%{base_url}) hesabınıza bir parola eklemenizi istedi. Alternatif olarak, bu onaylanmış e-posta adresiyle ilişkili desteklenen herhangi bir çevrimiçi hizmeti (Google, Facebook vb.) kullanarak giriş yapabilirsiniz. \nBu isteği siz yapmadıysanız bu e-postayı güvenle yok sayabilirsiniz. \nBir parola seçmek için aşağıdaki bağlantıya tıklayın: %{base_url}/u/password-reset/%{email_token}\n" admin_login: title: "Yönetici Girişi" subject_template: "[%{email_prefix}] Giriş" - text_body_template: "Birisi [%{site_name}] (%{base_url}) adresinde hesabınıza giriş yapmak istedi. \n\nBu isteği siz yapmadıysanız, bu e-postayı güvenle yok sayabilirsiniz. \n\nGiriş yapmak için aşağıdaki bağlantıyı tıklayın:\n %{base_url}/session/email-login/%{email_token}\n" + text_body_template: "Birisi [%{site_name}] (%{base_url}) adresinde hesabınıza giriş yapmak istedi. \n\nBu isteği siz yapmadıysanız bu e-postayı güvenle yok sayabilirsiniz. \n\nGiriş yapmak için aşağıdaki bağlantıya tıklayın:\n %{base_url}/session/email-login/%{email_token}\n" account_created: title: "Hesap oluşturuldu" subject_template: "[%{email_prefix}] Yeni Hesabınız" @@ -3302,7 +3261,7 @@ tr_TR: %{base_url}/u/confirm-new-email/%{email_token} - Bu değişikliği siz talep etmediyseniz, lütfen bir [site yöneticisi](%{base_url}/about) ile iletişime geçin. + Bu değişikliği siz talep etmediyseniz lütfen bir [site yöneticisi](%{base_url}/about) ile iletişime geçin. confirm_new_email_via_admin: title: "Yeni E-postayı Onayla" subject_template: "[%{email_prefix}] Yeni e-posta adresinizi onaylayın" @@ -3311,7 +3270,7 @@ tr_TR: %{base_url}/u/confirm-new-email/%{email_token} - Bu e-posta değişikliği bir site yöneticisi tarafından istendi. Bu değişikliği talep etmediyseniz, lütfen bir [site yöneticisi](%{base_url}/about) ile iletişime geçin. + Bu e-posta değişikliği bir site yöneticisi tarafından istendi. Bu değişikliği talep etmediyseniz lütfen bir [site yöneticisi](%{base_url}/about) ile iletişime geçin. confirm_old_email: title: "Eski E-postayı Onayla" subject_template: "[%{email_prefix}] Mevcut e-posta adresinizi onaylayın" @@ -3340,7 +3299,7 @@ tr_TR: title: "Eski E-postaya Bildir (Ekle)" subject_template: "[%{email_prefix}] Yeni bir e-posta adresi eklendi" text_body_template: | - Bu, %{site_name} sitesine bir e-posta adresinin eklendiğini bildirmek için gönderilen otomatik bir mesajdır. Bir yanlışlık olduğunu düşünüyorsanız, lütfen site yöneticisine başvurun. + Bu, %{site_name} sitesine bir e-posta adresinin eklendiğini bildirmek için gönderilen otomatik bir mesajdır. Bir yanlışlık olduğunu düşünüyorsanız lütfen site yöneticisine başvurun. Eklediğiniz e-posta adresi: @@ -3348,7 +3307,7 @@ tr_TR: signup_after_approval: title: "Onay Sonrası Kayıt" subject_template: "%{site_name} sitesinde hesabınız onaylandı!" - text_body_template: "%{site_name}'a hoş geldiniz!\n\nBir moderatör %{site_name} adresindeki hesabınızı onayladı.\n\nArtık yeni hesabınıza şu adresten giriş yaparak erişebilirsiniz: %{base_url} \n\nYukarıdaki bağlantı tıklanabilir değilse, kopyalayıp web tarayıcınızın adres çubuğuna yapıştırmayı deneyin. \n\n%{new_user_tips} \n\nHer zaman [medeni topluluk davranışına] (%{base_url}/guidelines) kontrolünü sağlıyoruz. \n\nKeyfini çıkarın!\n" + text_body_template: "%{site_name} sitesine hoş geldiniz!\n\nBir moderatör, %{site_name} adresindeki hesabınızı onayladı.\n\nArtık yeni hesabınıza %{base_url} adresinden giriş yaparak erişebilirsiniz\n\nYukarıdaki bağlantı tıklanabilir değilse kopyalayıp web tarayıcınızın adres çubuğuna yapıştırmayı deneyin. \n\n%{new_user_tips} \n\nHer zaman [medeni topluluk davranışı] (%{base_url}/guidelines) denetimini sağlıyoruz. \n\nKeyfini çıkarın!\n" signup_after_reject: title: "Red Sonrası Kayıt" subject_template: "%{site_name} hesabınız reddedildi" @@ -3359,15 +3318,15 @@ tr_TR: signup: title: "Kaydol" subject_template: "[%{email_prefix}] Yeni hesabınızı onaylayın" - text_body_template: "%{site_name}'a hoş geldiniz! \n\nYeni hesabınızı onaylamak ve etkinleştirmek için aşağıdaki bağlantıyı tıklayın: \n%{base_url}/u/activate-account/%{email_token}\n\nYukarıdaki bağlantı tıklanabilir değilse, kopyalayıp web tarayıcınızın adres çubuğuna yapıştırmayı deneyin.\n" + text_body_template: "%{site_name} sitesine hoş geldiniz! \n\nYeni hesabınızı onaylamak ve etkinleştirmek için aşağıdaki bağlantıyı tıklayın: \n%{base_url}/u/activate-account/%{email_token}\n\nYukarıdaki bağlantı tıklanabilir değilse kopyalayıp web tarayıcınızın adres çubuğuna yapıştırmayı deneyin.\n" activation_reminder: title: "Aktivasyon Hatırlatıcısı" subject_template: "[%{email_prefix}] Hesabınızı onaylamanız için hatırlatma" - text_body_template: "%{site_name}'a hoş geldiniz! \n\nHesabınızı etkinleştirmeniz kolay bir hatırlatmadır. \n\nYeni hesabınızı onaylamak ve etkinleştirmek için aşağıdaki bağlantıyı tıklayın: \n%{base_url}/u/activate-account/%{email_token} \n\nYukarıdaki bağlantı tıklanabilir değilse, kopyalayıp web tarayıcınızın adres çubuğuna yapıştırmayı deneyin.\n" + text_body_template: "%{site_name} sitesine hoş geldiniz! \n\nHesabınızı etkinleştirmeniz için bir hatırlatmadır. \n\nYeni hesabınızı onaylamak ve etkinleştirmek için aşağıdaki bağlantıyı tıklayın: \n%{base_url}/u/activate-account/%{email_token} \n\nYukarıdaki bağlantı tıklanabilir değilse kopyalayıp web tarayıcınızın adres çubuğuna yapıştırmayı deneyin.\n" suspicious_login: title: "Yeni Giriş Uyarısı" subject_template: "[%{site_name}] %{location}'dan Yeni Giriş" - text_body_template: "Merhaba, \n\nGenellikle kullanmadığınız bir cihazdan veya konumdan bir giriş fark ettik. Bu sen miydin? \n\n- Konum: %{location} (%{client_ip}) \n- Tarayıcı: %{browser} \n- Cihaz: %{device} - %{os} \n\nBu olsaydınız, harika! Yapmanız gereken başka bir şey yok.\n\n Bu siz değilseniz, lütfen [mevcut oturumlarınızı gözden geçirin] (%{base_url}/profilim/tercihlerim/hesap) ve parolanızı değiştirin.\n" + text_body_template: "Merhaba, \n\nGenellikle kullanmadığınız bir aygıttan veya konumdan bir giriş fark ettik. Bu siz miydiniz? \n\n- Konum: %{location} (%{client_ip}) \n- Tarayıcı: %{browser} \n- Cihaz: %{device} - %{os} \n\nEğer sizseniz harika! Yapmanız gereken başka bir şey yok.\n\nBu siz değilseniz lütfen [mevcut oturumlarınızı gözden geçirin] (%{base_url}/profilim/tercihlerim/hesap) ve parolanızı değiştirin.\n" post_approved: title: "Gönderiniz onaylandı" subject_template: "[%{site_name}] Gönderiniz onaylandı" @@ -3393,8 +3352,8 @@ tr_TR: ##[%{title} 'e hoş geldiniz](#Hoş geldiniz) Hesabınızın olması gerekmektedir. Lütfen devam edebilmek için yeni bir hesap oluşturun veya giriş yapın. welcome_message_invite_only: | - ##[%{title}' hoş geldiniz](#Hoş geldiniz) - Hesabınızın olması gerekmektedir. Lütfen devam edebilmek için var olan bir kullanıcıdan bir davet isteyin veya giriş yapın. + ##[%{title} başlığına hoş geldiniz](#Hoş geldiniz) + Bir hesabınızın olması gerekmektedir. Lütfen sürdürebilmek için var olan bir kullanıcıdan bir davet isteyin veya giriş yapın. deleted: "silindi" image: "resim" upload: @@ -3426,7 +3385,7 @@ tr_TR: avatar: missing: "Üzgünüz, bu e-posta adresiyle ilişkilendirilmiş bir avatar bulamadık. Tekrar yüklemeyi deneyebilir misiniz?" flag_reason: - sockpuppet: "Yeni bir kullanıcı bir konu oluşturdu ve aynı IP adresinden başka bir yeni kullanıcı(%{ip_address}) cevap yazdı. Site ayarları sayfasında `flag_sockpuppets` değerine göz atın." + sockpuppet: "Yeni bir kullanıcı bir konu oluşturdu ve aynı IP adresinden başka bir yeni kullanıcı(%{ip_address}) yanıt yazdı. Site ayarları sayfasında `flag_sockpuppets` değerine göz atın." spam_hosts: "Bu yeni kullanıcı aynı alan adına bağlantı içeren birden fazla gönderi oluşturmaya çalıştı. Bu kullanıcıdan gelen bağlantı içeren tüm linkler gözden geçirilmeli. Site ayarları sayfasındaki `newuser_spam_host_threshold` değerine göz atın." skipped_email_log: exceeded_emails_limit: "max_emails_per_day_per_user aşıldı" @@ -3492,7 +3451,7 @@ tr_TR: body: "Bu terimler <%{base_url}> adresindeki internet forumunun kullanımını yönetir. Forumu kullanmak için, forumu çalıştıran şirket olan %{company_name} ile bu şartları kabul etmelisiniz.\n\nŞirket, farklı koşullar altında başka ürün ve hizmetler sunabilir. Bu şartlar yalnızca forumun kullanımı için geçerlidir. \n\nİçindekiler: \n- [Önemli Terimler](#başlık--önemli terimler) \n- [Forumu Kullanma İzniniz](#başlık--izin) \n- [Forum Kullanım Koşulları](#başlık--koşullar) \n- [Kabul Edilebilir Kullanım](#başlık--kabul edilebilir kullanım) \n- [İçerik Standartları](#başlık--içerik standartları) \n- [Zorlama](#başlık--zorlama) \n- [Hesabınız](#başlık--sizin- hesabı) \n- [İçeriğiniz](#başlık--içeriğiniz) \n- [Sorumluluğunuz](#başlık--sorumluluk) \n- [Feragatnameler](#başlık--sorumluluk reddi beyanları) \n- [Sorumluluk Sınırları](#başlık--sorumluluk) \n- [Geribildirim](#başlık--geri bildirim) \n- [Fesih](#başlık--fesih) \n- [Anlaşmazlıklar](#başlık--anlaşmazlıklar) \n- [Genel Şartlar](#başlık--genel) \n- [İletişim ](#başlık--kişi) \n- [Değişiklikler](#başlık--değişiklikler) \n\n

Önemli Terimler

\n\n***Bu şartlar, [Feragatnameler](#başlık-feragatnameler) belgesindeki feragatnameler, [Sorumluluk Sınırları](#heading--liability) konusunda size karşı olan sorumluluk sınırlamaları gibi haklarınızı ve sorumluluklarınızı etkileyen bir dizi önemli hüküm içermektedir. [Kullanımınız için Sorumluluk](#başlık--sorumluluk) bölümündeki forumu kötüye kullanmanızdan dolayı şirketi kapsama sözleşmeniz ve [Anlaşmazlıklar](#başlık--anlaşmazlıklar).***\n\n

Forumu Kullanma İzniniz

\n\nBu şartlara tabi olarak şirket size forumu kullanma izni verir. Forumu kullanmak için herkesin bu şartları kabul etmesi gerekir.\n\n

Forumun Kullanım Koşulları

\n\nForumu kullanma izniniz aşağıdaki koşullara tabidir:\n1. En az on üç yaşında olmalısınız.\n\n2. Şirket sizinle doğrudan iletişime geçip giremeyeceğinizi belirtmek için bu forumu kullanamazsınız.\n\n3. Forumu [Kabul Edilebilir Kullanım](#başlık--kabul-edilebilir-kullanım) ve [İçerik Standartları](#başlık--içerik-standartları) uyarınca kullanmalısınız.\n\n

Kabul Edilebilir Kullanım

\n\n1. Forumu kullanarak yasayı çiğneyemezsiniz.\n\n2. Başkalarının hesabını forumda özel izinleri olmadan kullanamaz veya kullanmaya çalışamazsınız.\n\n3. Forumdaki kullanıcı adlarını veya diğer benzersiz tanımlayıcıları satın alamaz, satamaz veya başka şekilde ticaret yapamazsınız.\n\n4. Forum aracılığıyla reklam, zincir mektup veya başka talepler gönderemez veya forumu ticari posta listeleri veya veritabanları için adresler veya diğer kişisel verileri toplamak amacıyla kullanamazsınız.\n\n5. Foruma erişimi otomatikleştiremez veya web tarayıcısı, tarayıcı eklentisi veya eklentisi veya web tarayıcısı olmayan başka bir bilgisayar programı gibi forumu izleyemezsiniz. Forumu çalıştırıyorsanız, herkese açık bir arama motoru için dizine eklemek üzere forumu tarayabilirsiniz.\n\n6. Forumu dağıtım listelerine, haber gruplarına veya grup posta diğer adlarına e-posta göndermek için kullanamazsınız.\n\n7. Şirkete bağlı olduğunuzu veya onayladığınızı yanlış ima edemezsiniz.\n\n8. Forumdaki diğer web sayfalarındaki görüntülere veya köprü metni olmayan diğer içeriklere köprü oluşturamazsınız.\n\n9. Forumdan indirdiğiniz materyallerden tescilli mülkiyet gösteren hiçbir işareti kaldıramazsınız.\n\n10. Forumun hiçbir bölümünü başka web sitelerinde `