From 8aac646759f942a41a6afb57b4703d1b0a1a591f Mon Sep 17 00:00:00 2001 From: Daniel Hershcovich Date: Sat, 16 Apr 2016 08:07:57 +0300 Subject: [PATCH 001/320] Allow any username character in user search --- app/assets/javascripts/discourse/lib/user-search.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6 index 08d5c6bd639..eb5bc209b35 100644 --- a/app/assets/javascripts/discourse/lib/user-search.js.es6 +++ b/app/assets/javascripts/discourse/lib/user-search.js.es6 @@ -91,7 +91,7 @@ export default function userSearch(options) { return new Ember.RSVP.Promise(function(resolve) { // TODO site setting for allowed regex in username - if (term.match(/[^a-zA-Z0-9_\.\-]/)) { + if (term.match(/[^\w\.\-]/)) { resolve([]); return; } From 7811213ff95845dd639e7911fde7a20d28bfc8fb Mon Sep 17 00:00:00 2001 From: scossar Date: Sun, 15 May 2016 16:01:13 -0700 Subject: [PATCH 002/320] vertical-align text-top --- app/assets/stylesheets/common/components/badges.css.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index a7b4c8c1bfc..110ad1968a0 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -213,7 +213,9 @@ margin-top: 0; width: 100%; line-height: 1; + vertical-align: text-top; span.badge-category { + max-width: 100px; padding: 5px; } } From 9ace919f7c49c33f17d794606e64d4db28ec4962 Mon Sep 17 00:00:00 2001 From: Erick Guan Date: Fri, 15 Apr 2016 19:12:42 +0200 Subject: [PATCH 003/320] Add translation for topic title and remove dangling validation translation --- config/locales/server.en.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 57a68ba5b2e..6c5643b5d28 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -188,7 +188,6 @@ en: topic_not_found: "Something has gone wrong. Perhaps this topic was closed or deleted while you were looking at it?" just_posted_that: "is too similar to what you recently posted" - has_already_been_used: "has already been used" invalid_characters: "contains invalid characters" is_invalid: "is invalid; try to be a little more descriptive" next_page: "next page →" @@ -311,6 +310,8 @@ en: attributes: category: name: "Category Name" + topic: + title: 'Title' post: raw: "Body" user_profile: From 36ba5f6716db95d4b120bf1b89ea0dba02be4080 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 26 May 2016 07:54:55 +0530 Subject: [PATCH 004/320] FIX: broken onebox avatar image --- lib/pretty_text.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index b328f230f37..e1341006f38 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -267,7 +267,7 @@ module PrettyText protect do v8.eval < Date: Thu, 26 May 2016 01:08:48 -0700 Subject: [PATCH 005/320] clean up some embed CSS oddities --- app/assets/stylesheets/embed.css.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/assets/stylesheets/embed.css.scss b/app/assets/stylesheets/embed.css.scss index 826b4e284c0..03af8d2b98b 100644 --- a/app/assets/stylesheets/embed.css.scss +++ b/app/assets/stylesheets/embed.css.scss @@ -8,6 +8,10 @@ article.post { border-bottom: 1px solid #ddd; + img.avatar { + border-radius: 50%; + } + &.deleted { background-color: #ffe5e5; } @@ -141,3 +145,12 @@ footer { // load onebox CSS at the end @import "./common/base/onebox"; + +// we apparently use bottom margins on paras in the embed CSS, leading to weirdness +// which we will now clean up +aside.onebox { + margin-bottom: 20px; + p { + margin-bottom: 0 !important; + } +} From a92fd9d701d1ae0d0bcdfda26c5bd33e5d39543e Mon Sep 17 00:00:00 2001 From: David McClure Date: Thu, 26 May 2016 01:13:01 -0700 Subject: [PATCH 006/320] Add Site Setting to use HTML from incoming email when available. (#4236) --- config/locales/server.en.yml | 1 + config/site_settings.yml | 2 ++ lib/email/receiver.rb | 23 ++++++++++++++--------- spec/components/email/receiver_spec.rb | 12 ++++++++++++ 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index ee9d9ebb1f7..db341f15c55 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1166,6 +1166,7 @@ en: reply_by_email_enabled: "Enable replying to topics via email." reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com" + incoming_email_prefer_html: "Use the HTML instead of the text for incoming email. May cause unexcpeted formatting issues!" disable_emails: "Prevent Discourse from sending any kind of emails" diff --git a/config/site_settings.yml b/config/site_settings.yml index f58e42c6a2d..18c732a2b9d 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -544,6 +544,8 @@ email: pop3_polling_username: '' pop3_polling_password: '' log_mail_processing_failures: false + incoming_email_prefer_html: + default: false email_in: default: false client: true diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index bc2b98005f0..d71cf8ca7da 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -212,16 +212,21 @@ module Email text = fix_charset(@mail) end - # prefer text over html - text = trim_discourse_markers(text) if text.present? - text, elided = EmailReplyTrimmer.trim(text, true) if text.present? - return [text, elided] if text.present? + use_html = html.present? && (!text.present? || SiteSetting.incoming_email_prefer_html) + use_text = text.present? unless use_html - # clean the html if that's all we've got - html = Email::HtmlCleaner.new(html).output_html if html.present? - html = trim_discourse_markers(html) if html.present? - html, elided = EmailReplyTrimmer.trim(html, true) if html.present? - return [html, elided] if html.present? + if use_text + text = trim_discourse_markers(text) + text, elided = EmailReplyTrimmer.trim(text, true) + return [text, elided] + end + + if use_html + html = Email::HtmlCleaner.new(html).output_html + html = trim_discourse_markers(html) + html, elided = EmailReplyTrimmer.trim(html, true) + return [html, elided] + end end def fix_charset(mail_part) diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb index f996028ec16..7a802acd1de 100644 --- a/spec/components/email/receiver_spec.rb +++ b/spec/components/email/receiver_spec.rb @@ -171,6 +171,18 @@ describe Email::Receiver do expect(topic.posts.last.raw).to eq("This is the *text* part.") end + it "prefers html over text when site setting is enabled" do + SiteSetting.incoming_email_prefer_html = true + expect { process(:text_and_html_reply) }.to change { topic.posts.count } + expect(topic.posts.last.raw).to eq('This is the html part.') + end + + it "uses text when prefer_html site setting is enabled but no html is available" do + SiteSetting.incoming_email_prefer_html = true + expect { process(:text_reply) }.to change { topic.posts.count } + expect(topic.posts.last.raw).to eq("This is a text reply :)") + end + it "removes the 'on , wrote' quoting line" do expect { process(:on_date_contact_wrote) }.to change { topic.posts.count } expect(topic.posts.last.raw).to eq("This is the actual reply.") From c1b3912c3699b7d09e665c10baef6acf24348c04 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 26 May 2016 01:16:33 -0700 Subject: [PATCH 007/320] one more embed CSS tweak --- app/assets/stylesheets/embed.css.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/stylesheets/embed.css.scss b/app/assets/stylesheets/embed.css.scss index 03af8d2b98b..ae15f2cc66e 100644 --- a/app/assets/stylesheets/embed.css.scss +++ b/app/assets/stylesheets/embed.css.scss @@ -154,3 +154,9 @@ aside.onebox { margin-bottom: 0 !important; } } + +// images large enough for the lightbox wrapper don't have bottom margins +// either, unless we add one now +div.lightbox-wrapper { + margin-bottom: 20px; +} From 23799e342208cd910539c3ec5d88a1b56847bc93 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 26 May 2016 16:00:35 +0530 Subject: [PATCH 008/320] FIX: validate tl3_time_period max value --- config/site_settings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/site_settings.yml b/config/site_settings.yml index 18c732a2b9d..a6a000ad4c0 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -700,6 +700,7 @@ trust: tl3_time_period: default: 100 min: 1 + max: 1000000 tl3_requires_days_visited: default: 50 min: 0 From 7050042088187d169027a60bc0db95a74fd90e79 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 26 May 2016 11:50:15 -0400 Subject: [PATCH 009/320] Update translations --- config/locales/client.da.yml | 3 + config/locales/client.es.yml | 3 + config/locales/client.fi.yml | 2 + config/locales/client.fr.yml | 21 ++ config/locales/client.it.yml | 34 +++ config/locales/client.ja.yml | 260 +++++++++++-------- config/locales/client.pt.yml | 10 + config/locales/client.ro.yml | 6 +- config/locales/client.sq.yml | 2 +- config/locales/client.zh_CN.yml | 4 +- config/locales/server.ar.yml | 2 +- config/locales/server.es.yml | 5 +- config/locales/server.fi.yml | 5 +- config/locales/server.fr.yml | 22 +- config/locales/server.it.yml | 25 +- config/locales/server.ja.yml | 202 ++++++++++---- config/locales/server.pt.yml | 17 +- config/locales/server.pt_BR.yml | 2 +- config/locales/server.ro.yml | 10 +- config/locales/server.ru.yml | 4 +- config/locales/server.zh_CN.yml | 8 +- plugins/poll/config/locales/client.bs_BA.yml | 3 + plugins/poll/config/locales/client.fr.yml | 4 +- plugins/poll/config/locales/client.ja.yml | 2 +- plugins/poll/config/locales/server.ja.yml | 6 +- public/500.ja.html | 2 +- 26 files changed, 464 insertions(+), 200 deletions(-) diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 7c0f49740f5..001364a85a1 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -111,6 +111,7 @@ da: google+: 'del dette link på Google+' email: 'send dette link i en e-mail' action_codes: + public_topic: "offentliggjorde dette emne %{when}" split_topic: "delte dette emne op %{when}" invited_user: "Inviterede %{who} %{when}" removed_user: "fjernede %{who} %{when}" @@ -285,6 +286,8 @@ da: title: "Brugere" likes_given: "Givet" likes_received: "Modtaget" + topics_entered: "Set" + topics_entered_long: "Læste emner" time_read: "Læsetid" topic_count: "Emner" topic_count_long: "Emner oprettet" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 2a09159056f..a265c993c5d 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -302,6 +302,8 @@ es: title: "Usuarios" likes_given: "Dados" likes_received: "Recibidos" + topics_entered: "Vistos" + topics_entered_long: "Temas vistos" time_read: "Tiempo de Lectura" topic_count: "Temas" topic_count_long: "Temas creados" @@ -2620,6 +2622,7 @@ es: embed_truncate: "Truncar los posts insertados" embed_whitelist_selector: "Selector CSS para permitir elementos a embeber" embed_blacklist_selector: "Selector CSS para restringir elementos a embeber" + embed_classname_whitelist: "Clases CSS permitidas" feed_polling_enabled: "Importar posts usando RSS/ATOM" feed_polling_url: "URL del feed RSS/ATOM del que extraer datos" save: "Guardar ajustes de Insertado" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index 6cecab1d419..c19d2c70c02 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -111,6 +111,8 @@ fi: google+: 'jaa tämä linkki Google+:ssa' email: 'lähetä tämä linkki sähköpostissa' action_codes: + public_topic: "teki ketjusta julkisen %{when}" + private_topic: "teki ketjusta yksityisen %{when}" split_topic: "pilkkoi tämän ketjun %{when}" invited_user: "kutsui käyttäjän %{who} %{when}" removed_user: "poisti käyttäjän %{who} %{when}" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index be3d803ee31..0b513115fd8 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -302,6 +302,8 @@ fr: title: "Utilisateurs" likes_given: "Donnés" likes_received: "Reçus" + topics_entered: "Vus" + topics_entered_long: "Sujets consultés" time_read: "Temps de lecture" topic_count: "Sujets" topic_count_long: "Sujets créés" @@ -2620,6 +2622,7 @@ fr: embed_truncate: "Tronquer les messages intégrés" embed_whitelist_selector: "Sélecteur CSS pour les éléments qui seront autorisés dans les contenus intégrés" embed_blacklist_selector: "Sélecteur CSS pour les éléments qui seront interdits dans les contenus intégrés" + embed_classname_whitelist: "Classes CSS autorisées" feed_polling_enabled: "Importer les messages via flux RSS/ATOM" feed_polling_url: "URL du flux RSS/ATOM à importer" save: "Sauvegarder paramètres d'intégration" @@ -2753,6 +2756,9 @@ fr: watching: title: "Suivie" description: "Vous serez automatiquement abonné aux nouveaux sujets de ces catégories. Vous serez notifié de tous les nouveaux messages et sujets, et le décompte des messages non-lus et nouveaux aussi à côté de chaque sujet." + tracking: + title: "Suivi" + description: "Vous allez suivre automatiquement tous les nouveaux sujets dans ce tag. Le nombre de messages nouveaux et non lus apparaîtra à côté du sujet." regular: title: "Habitué" description: "Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre message." @@ -2765,3 +2771,18 @@ fr: new: "Vous n'avez aucun nouveau sujet." read: "Vous n'avez lu aucun sujet pour le moment." posted: "Vous n'avez écrit aucun message pour le moment." + latest: "Il n'y a pas de sujets récents." + hot: "Il n'y a pas de sujets populaires." + bookmarks: "Vous n'avez pas encore de sujets ajoutés aux signets." + top: "Il n'y a pas de meilleurs sujets." + search: "Il n'y a pas de résultats de recherche." + bottom: + latest: "Il n'y a plus de sujets récents." + hot: "Il n'y a plus de sujets populaires." + posted: "Il n'y a plus de sujets publiés." + read: "Il n'y a plus de sujets lus." + new: "Il n'y a plus de nouveaux sujets." + unread: "Il n'y a plus de sujets non lus." + top: "Il n'y a plus de meilleurs sujets." + bookmarks: "Il n'y a plus de sujets ajoutés aux signets." + search: "Il n'y a plus de résultats de recherche." diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 93de1785d44..b9983631aee 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -302,6 +302,8 @@ it: title: "Utenti" likes_given: "Dati" likes_received: "Ricevuti" + topics_entered: "Visualizzati" + topics_entered_long: "Argomenti Visualizzati" time_read: "Tempo di Lettura" topic_count: "Argomenti" topic_count_long: "Argomenti Creati" @@ -701,6 +703,9 @@ it: top_badges: "Migliori Targhette" no_badges: "Ancora nessuna targhetta." more_badges: "Altre Targhette" + top_links: "Migliori Collegamenti" + no_links: "Ancora nessun collegamento." + no_likes: "Ancora nessun \"Mi piace\"." associated_accounts: "Login" ip_address: title: "Ultimo indirizzo IP" @@ -2192,6 +2197,8 @@ it: grant_moderation: "assegna moderazione" revoke_moderation: "revoca moderazione" backup_operation: "operazione di backup" + deleted_tag: "etichetta cancellata" + renamed_tag: "etichetta rinominata" screened_emails: title: "Email Scansionate" description: "Quando qualcuno cerca di creare un nuovo account, verrando controllati i seguenti indirizzi email e la registrazione viene bloccata, o eseguita qualche altra azione." @@ -2478,6 +2485,7 @@ it: login: "Accesso" plugins: "Plugin" user_preferences: "Preferenze Utente" + tags: "Etichette" badges: title: Targhette new_badge: Nuova Targhetta @@ -2686,3 +2694,29 @@ it:

+ tagging: + all_tags: "Tutte Le Etichette" + selector_all_tags: "tutte le etichette" + changed: "etichette cambiate:" + tags: "Etichette" + choose_for_topic: "scegli delle etichette opzionali per questo argomento" + delete_tag: "Cancella Etichetta" + delete_confirm: "Sicuro di voler eliminare l'etichetta?" + rename_tag: "Rinomina Etichetta" + rename_instructions: "Scegli un nome per l'etichetta:" + sort_by: "Ordina per:" + sort_by_count: "conteggio" + sort_by_name: "nome" + filters: + without_category: "%{filter} %{tag} argomenti" + with_category: "%{filter} %{tag} argomenti in %{category}" + topics: + bottom: + hot: "Non ci sono ulteriori argomenti caldi." + posted: "Non ci sono ulteriori argomenti pubblicati." + read: "Non ci sono ulteriori argomenti letti." + new: "Non ci sono ulteriori nuovi argomenti." + unread: "Non ci sono ulteriori argomenti non letti." + top: "Non ci sono ulteriori argomenti di punta." + bookmarks: "Non ci sono ulteriori argomenti aggiunti ai segnalibri." + search: "Non ci sono ulteriori risultati di ricerca." diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 06b4f1e4d35..853ce02b75f 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -29,8 +29,8 @@ ja: long_no_year: "MMM D h:mm a" long_no_year_no_time: "MMM D" full_no_year_no_time: "MMMM Do" - long_with_year: "YYYY, D MMM h:mm a" - long_with_year_no_time: "YYYY, D MMM" + long_with_year: "YYYY, MMM D h:mm a" + long_with_year_no_time: "YYYY, MMM D" full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" @@ -38,13 +38,13 @@ ja: long_date_without_year_with_linebreak: "MMM D
LT" long_date_with_year_with_linebreak: "MMM D, 'YY
LT" tiny: - half_a_minute: "< 1分" + half_a_minute: "1分前" less_than_x_seconds: - other: "< %{count}秒" + other: "%{count}秒前" x_seconds: other: "%{count}秒" less_than_x_minutes: - other: "< %{count}分" + other: "%{count}分前" x_minutes: other: "%{count}分" about_x_hours: @@ -54,10 +54,10 @@ ja: about_x_years: other: "%{count}年" over_x_years: - other: "> %{count}年" + other: "%{count}年以上前" almost_x_years: other: "%{count}年" - date_month: "MMM D" + date_month: "MMM D日" date_year: "MMM 'YY" medium: x_minutes: @@ -92,12 +92,17 @@ ja: google+: 'Google+ でこのリンクを共有する' email: 'メールでこのリンクを送る' action_codes: + public_topic: "%{when} にこのトピックは公開されました" + private_topic: "%{when} にこのトピックは非公開にされました" invited_user: "%{who} から招待されました: %{when}" autoclosed: - enabled: 'クローズされました // %{when}' + enabled: 'クローズされました: %{when}' closed: - enabled: 'クローズされました // %{when}' - topic_admin_menu: "トピック管理" + enabled: 'クローズされました: %{when}' + visible: + enabled: 'リストに表示: %{when}' + disabled: 'リストから非表示: %{when}' + topic_admin_menu: "トピックの管理" emails_are_disabled: "メールアドレスの送信は管理者によって無効化されています。全てのメール通知は行われません" s3: regions: @@ -113,7 +118,7 @@ ja: ap_northeast_2: "Asia Pacific (Seoul)" sa_east_1: "South America (Sao Paulo)" edit: 'このトピックのタイトルとカテゴリを編集' - not_implemented: "申し訳ありませんが、この機能はまだ実装されていません" + not_implemented: "この機能はまだ実装されていません！" no_value: "いいえ" yes_value: "はい" generic_error: "申し訳ありませんが、エラーが発生しました" @@ -122,14 +127,14 @@ ja: log_in: "ログイン" age: "経過" joined: "参加時刻" - admin_title: "Admin" + admin_title: "管理設定" flags_title: "通報" show_more: "もっと見る" show_help: "オプション" links: "リンク" links_lowercase: other: "リンク" - faq: "よくある質問" + faq: "FAQ" guidelines: "ガイドライン" privacy_policy: "プライバシーポリシー" privacy: "プライバシー" @@ -155,7 +160,7 @@ ja: other: "{{count}}文字" suggested_topics: title: "関連トピック" - pm_title: "提案したメッセージ" + pm_title: "他のメッセージ" about: simple_title: "このサイトについて" title: "%{title}について" @@ -163,7 +168,7 @@ ja: our_admins: "管理者" our_moderators: "モデレータ" stat: - all_time: "今まで" + all_time: "すべて" last_7_days: "過去7日間" last_30_days: "過去30日間" like_count: "いいね！" @@ -191,7 +196,7 @@ ja: topic_count_unread: other: "{{count}} 個の未読トピック。" topic_count_new: - other: "{{count}} 個の新規トピック。" + other: "{{count}} 件の新しいトピック" click_to_show: "クリックして表示" preview: "プレビュー" cancel: "キャンセル" @@ -317,35 +322,35 @@ ja: '9': "引用" '11': "編集" '12': "アイテム送信" - '13': "インボックス" + '13': "受信ボックス" '14': "保留" categories: - all: "全てのカテゴリ" - all_subcategories: "全てのサブカテゴリ" + all: "すべてのカテゴリ" + all_subcategories: "すべてのサブカテゴリ" no_subcategory: "サブカテゴリなし" category: "カテゴリ" category_list: "カテゴリリストを表示" reorder: - title: "カテゴリを並び替える" - title_long: "カテゴリリストを再構築" + title: "カテゴリの並び替え" + title_long: "カテゴリリストを並べ直します" fix_order: "位置を修正" - save: "オーダーを保存" + save: "順番を保存" apply_all: "適用" position: "位置" posts: "投稿" topics: "トピック" - latest: "最新の投稿" - latest_by: "最新投稿： " + latest: "最近の投稿" + latest_by: "最新投稿: " toggle_ordering: "カテゴリの並び替えモードを切り替え" subcategories: "サブカテゴリ:" topic_stats: "新しいトピック数" topic_stat_sentence: - other: "過去 %{unit} 間 %{count} 個の新規トピック。" - post_stats: "新規トピック数:" + other: "過去 %{unit} 間 %{count} 個の新着トピック。" + post_stats: "新着トピック数:" post_stat_sentence: other: "過去 %{unit} 間 %{count} 個の新しい投稿。" ip_lookup: - title: IPアドレスで検索 + title: IPアドレスを検索 hostname: ホスト名 location: 現在地 location_not_found: （不明） @@ -356,7 +361,7 @@ ja: username: "ユーザ名" trust_level: "トラストレベル" read_time: "読んだ時間" - topics_entered: "Topics Entered" + topics_entered: "入力したトピック" post_count: "# 投稿" confirm_delete_other_accounts: "これらのアカウントを削除してもよろしいですか?" user_fields: @@ -367,7 +372,7 @@ ja: mute: "ミュート" edit: "プロフィールを編集" download_archive: "自分の投稿をダウンロード" - new_private_message: "新規メッセージ" + new_private_message: "新しいメッセージ" private_message: "メッセージ" private_messages: "メッセージ" activity_stream: "アクティビティ" @@ -393,7 +398,7 @@ ja: disable_jump_reply: "返信した後に投稿へ移動しない" dynamic_favicon: "新規または更新されたトピックのカウントをブラウザアイコンに表示する" edit_history_public: "投稿の編集履歴を公開する" - external_links_in_new_tab: "外部リンクを全て新しいタブで開く" + external_links_in_new_tab: "外部リンクをすべて別のタブで開く" enable_quoting: "選択したテキストを引用して返信する" change: "変更" moderator: "{{user}} はモデレータです" @@ -404,14 +409,19 @@ ja: suspended_notice: "このユーザは {{date}} まで凍結状態です。" suspended_reason: "理由: " github_profile: "Github" - mailing_list_mode: "投稿される度にメールで通知を受け取る(ミュートにしたトピック、カテゴリ以外)" + email_activity_summary: "アクティビティの情報" + mailing_list_mode: + enabled: "メーリングリストモードを有効にする" + instructions: | + この設定は、アクティビティの情報機能を無効化します。
+ ミュートしているトピックやカテゴリはこれらのメールには含まれません。 watched_categories: "ウォッチ中" watched_categories_instructions: "これらのカテゴリに新しく投稿されたトピックを自動的に参加します。これらのカテゴリに対して新しい投稿があった場合、登録されたメールアドレスと、コミュニティ内の通知ボックスに通知が届き、トピック一覧に新しい投稿数がつきます。" tracked_categories: "追跡中" tracked_categories_instructions: "カテゴリの新しいトピックを自動的に追跡します。トピックに対して新しい投稿があった場合、トピック一覧に新しい投稿数がつきます。" muted_categories: "ミュート中" delete_account: "アカウントを削除する" - delete_account_confirm: "本当にアカウントを削除しますか？削除されたアカウントは復元できません。" + delete_account_confirm: "アカウントを削除してもよろしいですか？削除されたアカウントは復元できません。" deleted_yourself: "あなたのアカウントは削除されました。" delete_yourself_not_allowed: "アカウントを削除できませんでした。サイトの管理者へ連絡してください。" unread_message_count: "メッセージ" @@ -428,15 +438,15 @@ ja: warnings_received: "警告" messages: all: "すべて" - inbox: "Inbox" + inbox: "受信ボックス" sent: "送信済み" archive: "アーカイブ" groups: "自分のグループ" bulk_select: "メッセージを選択" - move_to_inbox: "Inboxへ移動" + move_to_inbox: "受信ボックスへ移動" move_to_archive: "アーカイブ" failed_to_move: "選択したメッセージを移動できませんでした(ネットワークがダウンしている可能性があります)" - select_all: "全てを選択する" + select_all: "すべて選択する" change_password: success: "(メールを送信しました)" in_progress: "(メールを送信中)" @@ -448,7 +458,7 @@ ja: error: "変更中にエラーが発生しました。" change_username: title: "ユーザ名を変更" - confirm: "ユーザ名を変更すると、投稿への引用と @ユーザ名でメンションされた時のリンクが解除されます。本当にユーザ名を変更してもよろしいですか?" + confirm: "ユーザ名を変更すると、投稿への引用と @ユーザ名でメンションされた時のリンクが解除されます。ユーザ名を変更しても本当によろしいですか？" taken: "このユーザ名は既に使われています。" error: "ユーザ名変更中にエラーが発生しました。" invalid: "このユーザ名は無効です。英数字のみ利用可能です。" @@ -481,6 +491,8 @@ ja: ok: "確認用メールを送信します" invalid: "正しいメールアドレスを入力してください" authenticated: "あなたのメールアドレスは {{provider}} によって認証されています" + frequency: + other: "最後に利用されてから{{count}}分以上経過した場合にメールを送ります。" name: title: "名前" instructions: "フルネーム(任意)" @@ -520,24 +532,30 @@ ja: title: "いいねされた時に通知" always: "常時" email_previous_replies: + title: "メールの文章の下部に以前の返信を含める" always: "常に" email_digests: - title: "サイトを訪れていない場合、ダイジェストをメールで送信する" + title: "サイトを訪れていない場合、まとめをメールで送る" every_30_minutes: "30分毎" every_hour: "1時間毎" daily: "毎日" every_three_days: "3日毎" weekly: "毎週" every_two_weeks: "2週間に1回" + include_tl0_in_digests: "新しいユーザからの投稿を含める" email_direct: "誰かが投稿を引用した時、投稿に返信があった時、私のユーザ名にメンションがあった時、またはトピックへの招待があった時にメールで通知を受け取る。" email_private_messages: "メッセージを受け取ったときにメールで通知を受け取る。" - email_always: "フォーラムにアクティブに参加している状態でも常にメール通知を受け取る" + email_always: "常にメールへ通知を送る" other_settings: "その他" categories_settings: "カテゴリ設定" new_topic_duration: label: "以下の条件でトピックを新規と見なす" - not_viewed: "未読のもの" + not_viewed: "未読" last_here: "ログアウトした後に投稿されたもの" + after_1_day: "昨日投稿されたもの" + after_2_days: "2日前に投稿されたもの" + after_1_week: "先週投稿されたもの" + after_2_weeks: "2週間前に投稿されたもの" auto_track_topics: "自動でトピックを追跡する" auto_track_options: never: "追跡しない" @@ -593,13 +611,23 @@ ja: time_read: "読んだ時間" topic_count: other: "つのトピックを作成" + post_count: + other: "つの投稿" + likes_given: + other: "あげた " + likes_received: + other: "もらった " + days_visited: + other: "訪問日数" posts_read: other: "読んだ投稿" bookmark_count: other: "つのブックマーク" no_replies: "まだ返信はありません。" no_topics: "まだトピックはありません。" + top_badges: "最近ゲットしたバッジ" no_badges: "まだバッジはありません。" + more_badges: "バッジをもっと見る" associated_accounts: "関連アカウント" ip_address: title: "最近使用したIPアドレス" @@ -667,7 +695,7 @@ ja: enabled_description: "トピックのまとめを表示されています。" description: "{{replyCount}}件の返信があります。" enable: 'このトピックを要訳する' - disable: '全ての投稿を表示する' + disable: 'すべての投稿を表示する' deleted_filter: enabled_description: "削除された投稿は非表示になっています。" disabled_description: "削除された投稿は表示しています。" @@ -675,8 +703,8 @@ ja: disable: "削除された投稿を表示する" private_message_info: title: "メッセージ" - invite: "友だちを招待する..." - remove_allowed_user: "このメッセージから{{name}}を本当に取り除きますか？" + invite: "他の人を招待する..." + remove_allowed_user: "このメッセージから {{name}} を削除してもよろしいですか？" email: 'メール' username: 'ユーザ名' last_seen: '最終アクティビティ' @@ -693,9 +721,9 @@ ja: invite: "ユーザ名かメールアドレスを入力してください。パスワードリセット用のメールを送信します。" reset: "パスワードをリセット" complete_username: "%{username},アカウントにパスワード再設定メールを送りました。" - complete_email: "%{email}にパスワード再設定メールを送りました。" + complete_email: "%{email}宛にパスワード再設定メールを送信しました。" complete_username_found: "%{username},アカウントにパスワード再設定メールを送りました。" - complete_email_found: "%{email}にパスワード再設定メールを送りました。" + complete_email_found: "%{email}宛にパスワード再設定メールを送信しました。" complete_username_not_found: " %{username}は見つかりませんでした" complete_email_not_found: "%{email}で登録したアカウントがありません。" login: @@ -767,13 +795,14 @@ ja: reply_here: "ここに返信" reply: "返信" cancel: "キャンセル" - create_topic: "トピック作成" + create_topic: "トピックを作る" create_pm: "メッセージ" title: "またはCtrl+Enter" users_placeholder: "ユーザの追加" title_placeholder: "トピックのタイトルを入力してください。" edit_reason_placeholder: "編集する理由は何ですか?" show_edit_reason: "(編集理由を追加)" + reply_placeholder: "文章を入力してください。 Markdown, BBコード, HTMLが使用出来ます。 画像はドラッグアンドドロップで貼り付けられます。" view_new_post: "新しい投稿を見る。" saving: "保存中" saved: "保存完了!" @@ -832,7 +861,7 @@ ja: invitee_accepted: "

{{username}} accepted your invitation

" moved_post: "

{{username}} moved {{description}}

" linked: "

{{username}} {{description}}

" - granted_badge: "

{{description}}バッジをゲットしました

" + granted_badge: "

'{{description}}' バッジをゲット！

" group_message_summary: other: "

{{count}}件のメッセージが{{group_name}}へ着ています

" alt: @@ -844,6 +873,7 @@ ja: invitee_accepted: "招待が承認されました: " moved_post: "投稿を移動しました: " linked: "あなたの投稿にリンク" + granted_badge: "バッジを付与" group_message_summary: "グループ宛のメッセージがあります" popup: mentioned: '"{{topic}}"で{{username}} がタグ付けしました - {{site_title}}' @@ -865,20 +895,25 @@ ja: select_file: "ファイル選択" image_link: "イメージのリンク先" search: - latest_post: "最新の投稿" - select_all: "全てを選択する" + sort_by: "並べ替え" + relevance: "一番関連しているもの" + latest_post: "最近の投稿" + most_viewed: "最も閲覧されている順" + most_liked: "「いいね！」されている順" + select_all: "すべて選択する" + clear_all: "すべてクリア" title: "トピック、投稿、ユーザ、カテゴリを探す" no_results: "何も見つかりませんでした。" - no_more_results: "何も見つかりませんでした。" + no_more_results: "検索結果は以上です。" search_help: 検索ヘルプ searching: "検索中..." post_format: "#{{post_number}} {{username}}から" context: user: "@{{username}}の投稿を検索" - category: "\"{{category}}\" カテゴリで検索する" topic: "このトピックを探す" private_messages: "メッセージ検索" hamburger_menu: "他のトピック一覧やカテゴリを見る" + new_item: "新着" go_back: '戻る' not_logged_in_user: 'ユーザアクティビティと設定ページ' current_user: 'ユーザページに移動' @@ -887,7 +922,7 @@ ja: unlist_topics: "トピックをリストから非表示にする" reset_read: "未読に設定" delete: "トピックを削除" - dismiss_new: "既読に設定" + dismiss_new: "既読にする" toggle: "選択したトピックを切り替え" actions: "操作" change_category: "カテゴリを変更" @@ -897,6 +932,7 @@ ja: choose_new_category: "このトピックの新しいカテゴリを選択してください" selected: other: "あなたは {{count}} トピックを選択しました。" + change_tags: "タグを変更" none: unread: "未読のトピックはありません。" new: "新しいトピックはありません。" @@ -910,13 +946,13 @@ ja: search: "検索結果はありません。" educate: new: '

新しいトピックがここに表示されます。

デフォルトで、新しいトピックがある場合は2日間、 new が表示されます。

設定はプロフィール設定から変更できます。

' - unread: '

新しいトピックがここに表示されます。

未読のトピックがある場合は、1と表示されます。 もし、

  • トピックを作る
  • トピックに返信
  • 4分以上のトピックを読む場合

などを設定した場合、トピックを追跡してそれぞれのトピックの下にある通知の設定を経由してウォッチします。

プロフィール から変更できます。

' + unread: '

新しいトピックがここに表示されます。

未読のトピックがある場合は、1が表示されます。 もし、

  • トピックを作る
  • トピックに返信
  • トピックを4分以上読む

などを行った場合、トピックを追跡してそれぞれのトピックの下にある通知の設定を経由してウォッチします。

プロフィールから変更できます。

' bottom: latest: "最新のトピックは以上です。" hot: "ホットなトピックは以上です。" posted: "投稿のあるトピックは以上です。" read: "既読のトピックは以上です。" - new: "新規トピックは以上です。" + new: "新着トピックは以上です。" unread: "未読のトピックは以上です。" category: "{{category}}トピックは以上です。" top: "トップトピックはこれ以上ありません。" @@ -929,11 +965,13 @@ ja: private_message: 'メッセージを書く' archive_message: title: 'アーカイブ' + move_to_inbox: + title: '受信ボックスへ移動' list: 'トピック' - new: '新規トピック' + new: '新着トピック' unread: '未読' new_topics: - other: '{{count}}個の新規トピック' + other: '{{count}}個の新着トピック' unread_topics: other: '{{count}}個の未読トピック' title: 'トピック' @@ -958,7 +996,7 @@ ja: back_to_list: "トピックリストに戻る" options: "トピックオプション" show_links: "このトピック内のリンクを表示" - toggle_information: "トピック詳細をトグル" + toggle_information: "トピックの詳細を切り替え" read_more_in_category: "{{catLink}}の他のトピックを見る or {{latestLink}}。" read_more: "{{catLink}} or {{latestLink}}。" read_more_MF: "{ UNREAD, plural, =0 {} one { 未読 1つ } other { 未読 #つ } } { NEW, plural, =0 {} one { {BOTH, select, true{} false {} other{}} 新規トピック 1つ} other { {BOTH, select, true{} false {} other{}} 新規トピック #つ} } remaining, or {CATEGORY, select, true {{catLink}の他のトピックを読む} false {{latestLink}} other {}}" @@ -1026,7 +1064,7 @@ ja: actions: recover: "トピックの削除を取り消す" delete: "トピックを削除" - open: "トピックを開く" + open: "トピックをオープン" close: "トピックをクローズする" multi_select: "投稿を選択" auto_close: "自動でクローズする..." @@ -1086,6 +1124,7 @@ ja: success: "ユーザにメッセージへの参加を招待しました。" error: "申し訳ありませんが、ユーザ招待中にエラーが発生しました。" group_name: "グループ名" + controls: "オプション" invite_reply: title: '招待' username_placeholder: "ユーザ名" @@ -1137,7 +1176,7 @@ ja: select_replies: '返信と選択' delete: 選択中のものを削除 cancel: 選択を外す - select_all: 全てを選択する + select_all: すべて選択する deselect_all: 全ての選択を外す description: other: {{count}}個の投稿を選択中。 @@ -1207,7 +1246,7 @@ ja: unwiki: "wiki投稿から外す" convert_to_moderator: "スタッフカラーを追加" revert_to_regular: "スタッフカラーを外す" - rebake: "HTMLを再構築" + rebake: "HTMLを再構成" unhide: "表示する" change_owner: "オーナーシップを変更" actions: @@ -1278,7 +1317,7 @@ ja: other: "{{count}}人のユーザがこのポストに投票しました" delete: confirm: - other: "本当にこれらの投稿を削除しますか?" + other: "これらの投稿を削除してもよろしいですか？" revisions: controls: first: "最初のリビジョン" @@ -1311,7 +1350,7 @@ ja: topic_template: "トピックテンプレート" delete: 'カテゴリを削除する' create: '新規カテゴリ' - create_long: '新しいカテゴリを作る' + create_long: '新しいカテゴリを作ります' save: 'カテゴリを保存する' slug: 'カテゴリスラグ' slug_placeholder: '(任意)URL用' @@ -1327,7 +1366,7 @@ ja: foreground_color: "文字表示色" name_placeholder: "簡潔な名前にしてください。" color_placeholder: "任意の Web カラー" - delete_confirm: "本当にこのカテゴリを削除してもよいですか?" + delete_confirm: "このカテゴリを削除してもよろしいですか？" delete_error: "カテゴリ削除に失敗しました。" list: "カテゴリをリストする" no_description: "このカテゴリの説明はありません。トピック定義を編集してください。" @@ -1475,7 +1514,7 @@ ja: lower_title_with_count: other: "{{count}}件" lower_title: "新着" - title: "新規" + title: "新着" title_with_count: other: "最新 ({{count}})" help: "最近投稿されたトピック" @@ -1494,25 +1533,25 @@ ja: title: "トップ" help: "過去年間、月間、週間及び日間のアクティブトピック" all: - title: "今まで" + title: "すべて" yearly: - title: "今年" + title: "年ごと" quarterly: title: "3ヶ月おき" monthly: - title: "今月" + title: "月ごと" weekly: title: "毎週" daily: - title: "毎日" - all_time: "今まで" + title: "日ごと" + all_time: "すべて" this_year: "年" this_quarter: "今季" this_month: "月" this_week: "週" - today: "本日" + today: "今日" other_periods: "次の期間のトピックを見る" - browser_update: 'ここで動作するにはブラウザのバージョンが古すぎます。 。 ここでブラウザアップグレード.' + browser_update: 'ご利用のブラウザのバージョンが古いです。 ブラウザをアップデートしてください。' permission_types: full: "作成 / 返信 / 閲覧" create_post: "返信 / 閲覧" @@ -1661,7 +1700,7 @@ ja: regenerate: "API キーを再生成" revoke: "無効化" confirm_regen: "このAPIキーを新しいものに置き換えてもよろしいですか?" - confirm_revoke: "このキーを無効化しても本当によろしいですか?" + confirm_revoke: "このキーを無効化してもよろしいですか？" info_html: "API キーを使うと、JSON 呼び出しでトピックの作成・更新を行うことが出来ます。" all_users: "全てのユーザ" note_html: "このキーは、秘密にしてください。このキーを持っている全てのユーザは任意のユーザとして、好きな投稿を作成できます" @@ -1708,10 +1747,10 @@ ja: cancel: label: "キャンセル" title: "バックアップ作業をキャンセルする" - confirm: "本当に実行中バックアップ作業をキャンセルしますか？" + confirm: "実行中のバックアップをキャンセルしてもよろしいですか？" backup: label: "バックアップ" - title: "バックアップを作成" + title: "バックアップを行います" confirm: "新しくバックアップを行ってもよろしいですか？" without_uploads: "はい(ファイルは含まない)" download: @@ -1727,10 +1766,10 @@ ja: confirm: "バックアップを復元してもよろしいですか？" rollback: label: "ロールバック" - title: "データベースを元の作業状態にロールバックする" + title: "データベースを前回の状態に戻します" export_csv: user_archive_confirm: "投稿をダウンロードしてもよろしいですか？" - success: "エスクポートを開始しました。処理が完了すると、メッセージで通知されます。" + success: "エクスポートを開始しました。処理が完了した後、メッセージでお知らせします。" failed: "出力失敗。詳しくはログに参考してください。" rate_limit_error: "投稿は1日に1度だけダウンロードできます。また明日お試しください。" button_text: "エクスポート" @@ -1768,7 +1807,7 @@ ja: explain_rescue_preview: "既定スタイルシートでサイトを表示する" save: "保存" new: "新規" - new_style: "新規スタイル" + new_style: "新しいスタイル" import: "インポート" import_title: "ファイルを選択するかテキストをペースト" delete: "削除" @@ -1826,7 +1865,7 @@ ja: email: title: "メール" settings: "設定" - preview_digest: "ダイジェストのプレビュー" + preview_digest: "まとめのプレビュー" sending_test: "テストメールを送信中..." error: "ERROR - %{server_error}" test_error: "テストメールを送れませんでした。メール設定、またはホストをメールコネクションをブロックされていないようを確認してください。" @@ -1859,7 +1898,7 @@ ja: title: "フィルター" user_placeholder: "ユーザ名" address_placeholder: "name@example.com" - type_placeholder: "ダイジェスト、サインアップ..." + type_placeholder: "まとめ、サインアップ..." reply_key_placeholder: "返信キー" skipped_reason_placeholder: "理由" logs: @@ -1881,7 +1920,7 @@ ja: staff_actions: title: "スタッフ操作" instructions: "ユーザ名、アクションをクリックすると、リストはフィルタされます。プロフィール画像をクリックするとユーザページに遷移します" - clear_filters: "全てを表示する" + clear_filters: "すべて表示する" staff_user: "スタッフユーザ" target_user: "対象ユーザ" subject: "対象" @@ -1934,7 +1973,7 @@ ja: screened_ips: title: "スクリーン対象IP" description: '参加中のIPアドレス。IPアドレスをホワイトリストに追加するには "許可" を利用してください。' - delete_confirm: "%{ip_address} のルールを本当に削除しますか?" + delete_confirm: "%{ip_address} のルールを削除してもよろしいですか？" roll_up_confirm: "Are you sure you want to roll up commonly screened IP addresses into subnets?" rolled_up_some_subnets: "Successfully rolled up IP ban entries to these subnets: %{subnets}." rolled_up_no_subnet: "There was nothing to roll up." @@ -1982,7 +2021,7 @@ ja: active: 'アクティブユーザ' new: '新規ユーザ' pending: '保留中のユーザ' - newuser: 'トラストレベル0のユーザ (新規ユーザ)' + newuser: 'トラストレベル0のユーザ (新しいユーザ)' basic: 'トラストレベル1のユーザ (ベーシックユーザ)' staff: "スタッフ" admins: '管理者ユーザ' @@ -2011,17 +2050,18 @@ ja: suspend: "凍結" unsuspend: "凍結解除" suspended: "凍結状態" - moderator: "モデレータ?" - admin: "管理者?" - blocked: "ブロック中?" + moderator: "モデレータ権限の所有" + admin: "管理者権限の所有" + blocked: "ブロック状態" + staged: "ステージドモードの状態" show_admin_profile: "アカウントの管理" edit_title: "タイトルを編集" save_title: "タイトルを保存" refresh_browsers: "ブラウザを強制リフレッシュ" refresh_browsers_message: "全てのクライアントにメッセージが送信されました！" - show_public_profile: "公開されるプロフィールを見る" + show_public_profile: "公開プロフィールを見る" impersonate: 'このユーザになりすます' - ip_lookup: "IP検索" + ip_lookup: "IPアドレスを検索" log_out: "ログアウト" logged_out: "すべてのデバイスでログアウトしました" revoke_admin: '管理者権限を剥奪' @@ -2061,7 +2101,7 @@ ja: other: "全ての投稿を削除できませんでした。%{count}日以上経過した投稿があります。(設定: delete_user_max_post_age)" cant_delete_all_too_many_posts: other: "全ての投稿を削除できませんでした。ユーザは%{count} 件以上投稿しています。(delete_all_posts_max)" - delete_confirm: "本当にこのユーザを削除しますか？" + delete_confirm: "このユーザを削除してもよろしいですか？" delete_and_block: " 削除する。このメールとIPアドレスからのサインアップを以後ブロック" delete_dont_block: "削除する" deleted: "ユーザが削除されました。" @@ -2079,6 +2119,7 @@ ja: deactivate_explanation: "アクティベート解除されたユーザは、メールで再アクティベートする必要があります。" suspended_explanation: "凍結中のユーザはログインできません。" block_explanation: "ブロックされているユーザは投稿およびトピックの作成ができません。" + staged_explanation: "ステージドユーザは特定のトピック宛に、メールを経由して投稿する事が出来ます。" trust_level_change_failed: "ユーザのトラストレベル変更に失敗しました。" suspend_modal_title: "凍結中のユーザ" trust_level_2_users: "トラストレベル2のユーザ" @@ -2187,20 +2228,21 @@ ja: title: バッジ new_badge: 新しいバッジ new: 新規 - name: バッジ名 + name: バッジの名前 badge: バッジ display_name: バッジの表示名 description: バッジの説明 + long_description: 詳しい説明 badge_type: バッジの種類 badge_grouping: グループ badge_groupings: - modal_title: バッジの振り分け + modal_title: バッジのグループ granted_by: 'バッジをつけた人: ' granted_at: 'バッジをつけた日: ' reason_help: (投稿かトピックへのリンク) save: バッジを保存する - delete: バッジを削除する - delete_confirm: 本当にこのバッジを削除しますか？ + delete: 削除 + delete_confirm: このバッジを削除してもよろしいですか？ revoke: 取り消す reason: 理由 expand: '&hellipを展開' @@ -2212,17 +2254,17 @@ ja: no_user_badges: "%{name} はバッジを付けられていません。" no_badges: 付けられるバッジがありません none_selected: "バッジを選択して開始" - allow_title: バッジは、タイトルとして使用されることを許可する - multiple_grant: 複数回付与することができます - listable: パブリックパッジページに表示するバッジ - enabled: バッジシステムを使う + allow_title: バッジをタイトルとして使用されることを許可する + multiple_grant: 何度もゲットできるようにする + listable: 公開されるバッジページにバッジを表示する + enabled: バッジを有効にする icon: アイコン image: 画像 icon_help: "Font Awesomeのクラスか画像のURLを使用してください" query: バッジクエリ(SQL) target_posts: 投稿を対象 - auto_revoke: 毎日失効クエリを実行 - show_posts: バッジページの付与したバッジで投稿を表示 + auto_revoke: 毎日クエリの取り消しを実行 + show_posts: バッジページでバッジを取得したことを投稿する trigger: トリガー trigger_type: none: "毎日更新する" @@ -2279,16 +2321,18 @@ ja: search_help: title: 'Search Help' keyboard_shortcuts_help: - title: 'キーボードショートカット' + title: 'ショートカットキー' jump_to: title: 'ページ移動' home: 'g, h ホーム' latest: 'g, l 最新' - new: 'g, n 新規' + new: 'g, n 新着' unread: 'g, u 未読' categories: 'g, c カテゴリ' top: 'g, t トップ' bookmarks: 'g, b ブックマーク' + profile: 'g, p プロフィール' + messages: 'g, m メッセージ' navigation: title: 'ナビゲーション' jump: '# # 投稿へ' @@ -2300,6 +2344,7 @@ ja: title: 'アプリケーション' create: 'c 新しいトピックを作成' notifications: 'n お知らせを開く' + hamburger_menu: '= メニューを開く' user_profile_menu: 'p ユーザメニュを開く' show_incoming_updated_topics: '. 更新されたトピックを表示する' search: '/ 検索' @@ -2308,7 +2353,7 @@ ja: dismiss_topics: 'Dismiss Topics' actions: title: '操作' - bookmark_topic: 'f トピックのブックマークをトグル' + bookmark_topic: 'f トピックのブックマークを切り替え' pin_unpin_topic: 'shift+pトピックを ピン留め/ピン留め解除' share_topic: 'shift+s トピックをシェア' share_post: 's 投稿をシェアする' @@ -2326,7 +2371,10 @@ ja: mark_tracking: 'm, t トピックを追跡する' mark_watching: 'm, w トピックを参加中にする' badges: + granted_on: "%{date} にゲット" title: バッジ + allow_title: "タイトルとしての使用" + multiple_grant: "何度も取得可能" badge_count: other: "%{count} バッジ" more_badges: @@ -2337,7 +2385,7 @@ ja: none: "" badge_grouping: getting_started: - name: Getting Started + name: はじめの一歩 community: name: コミュニティ trust_level: @@ -2345,4 +2393,12 @@ ja: other: name: その他 posting: - name: 投稿中 + name: 投稿 + tagging: + changed: "タグを変更しました:" + sort_by: "並べ替え:" + topics: + none: + search: "検索結果は何もありません。" + bottom: + search: "検索結果は以上です。" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 03cacd03f30..dde94329140 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -111,6 +111,8 @@ pt: google+: 'partilhar esta hiperligação no Google+' email: 'enviar esta hiperligação por email' action_codes: + public_topic: "tornei este tópico publico %{when}" + private_topic: "tornei este tópico privado %{when}" split_topic: "dividir este tópico %{when}" invited_user: "Convidou %{who} %{when}" removed_user: "Removeu %{who} %{when}" @@ -2115,6 +2117,7 @@ pt: test_error: "Occorreu um problema no envio do email de teste. Por favor verifique novamente as suas definições de email, verifique se o seu host não está a bloquear conexões de email, e tente novamente." sent: "Enviado" skipped: "Ignorado" + bounced: "Devolvida" received: "Recebido" rejected: "Rejeitado" sent_at: "Enviado em" @@ -2765,3 +2768,10 @@ pt: bottom: latest: "Não há mais tópicos recentes." hot: "Não há mais tópicos quentes." + posted: "Não existem mais tópicos publicados." + read: "Não existem mais tópicos lidos." + new: "Não existem mais tópicos novos." + unread: "Não existem mais tópicos por ler." + top: "Não existem mais tópicos de topo." + bookmarks: "Não existem mais tópicos marcados." + search: "Não existem mais resultados de pesquisa." diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index 61f124d3c34..7d4a573ea8f 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -554,7 +554,7 @@ ro: username: title: "Nume Utilizator" instructions: "Numele de utilizator trebuie sa fie unic, fără spații, scurt." - short_instructions: "Ceilalți te pot numii @{{username}}." + short_instructions: "Ceilalți te pot menționa ca @{{username}}." available: "Numele de utilizator este valabil." global_match: "Emailul se potrivește numelui de utilizator înregistrat." global_mismatch: "Deja înregistrat. Încearcă:{{suggestion}}?" @@ -1501,10 +1501,11 @@ ro: muted: title: "Silențios" flagging: - title: 'De ce marcați această postare ca fiind privată?' + title: 'Mulțumim că ne ajuți să păstrăm o comunitate civilizată!' action: 'Marcare' take_action: "Actionează" notify_action: 'Mesaj' + official_warning: 'Avertismen Oficial' delete_spammer: "Șterge spammer" delete_confirm: "Sunteți pe punctul de a șterge postarea %{posts} și postările %{topics} ale acestui uitilizator, de a-i anula contul, de a-i bloca autentificarea de la adresa IP %{ip_address}, adresa de email %{email} și de a bloca listarea permanent. Sunteți sigur ca acest utilizator este un spammer?" yes_delete_spammer: "Da, Șterge spammer" @@ -1513,6 +1514,7 @@ ro: submit_tooltip: "Acceptă marcarea privată" take_action_tooltip: "Accesati permisiunea marcarii imediat, nu mai asteptati alte marcaje comune" cant: "Ne pare rău nu puteți marca această postare deocamdată." + notify_staff: 'Notifică un moderator în privat' formatted_name: off_topic: "În afară discuției" inappropriate: "Inadecvat" diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 293571f4645..c8aed6f5055 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -124,7 +124,7 @@ sq: disabled: 'hapur %{when}' archived: enabled: 'arkivoi %{when}' - disabled: 'çarkivuar %{when}' + disabled: 'paarkivuar %{when}' pinned: enabled: 'mbërthyer %{when}' disabled: 'zbërthyer %{when}' diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 268a19e1970..8847a7f49c2 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -2602,8 +2602,8 @@ zh_CN:

tagging: - all_tags: "所以标签" - selector_all_tags: "所以标签" + all_tags: "所有标签" + selector_all_tags: "所有标签" changed: "标签被修改" tags: "标签" choose_for_topic: "为主题选择可选标签" diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 8042ec35565..6a86bd1bd7f 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -898,7 +898,7 @@ ar: post_excerpt_maxlength: "الحد الأقصى لطول وظيفة مقتطف / ملخص." post_onebox_maxlength: "الحد الأقصى لطول مشاركة oneboxed Discourse بالأحرف." onebox_domains_whitelist: "قائمة بالمجالات للسماح روابط تفصيلي؛ وينبغي دعم هذه المجالات OpenGraph أو oEmbed. اختبار لهم في http://iframely.com/debug" - logo_url: "صورة الشعار في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مستطيل واسع. إذا كان سيتم إظهار غادر نص عنوان موقع على بياض." + logo_url: "صورة الشعار في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مستطيل واسع. إذا ترك الحقل فارغا فسيتم استخدام اسم الموقع." logo_small_url: "صورة الشعار صغيرة في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مربع، وينظر عند التمرير لأسفل. وإذا ترك فارغا أن أظهرت الصورة الرمزية المنزل." favicon_url: "الأيقونة الخاصة بموقعك, شاهد http://en.wikipedia.org/wiki/Favicon, لتعمل بشكل صحيح ضمن CDN يجب ان تكون بصيغة png." mobile_logo_url: "صورة الشعار الثابتة ستظهر في الجزء العلوي الأيسر في نسخة الجوال من موقعك. يجب أن تكون مربعة. إذا تُركت فارغة، سيتم استخدام الـ `logo_url`. على سبيل المثال: http://example.com/uploads/default/logo.png" diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index aecd86c1a2c..4d93a22e2cd 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -31,6 +31,7 @@ es: incoming: default_subject: "Email entrante desde %{email}" show_trimmed_content: "Mostrar contenido recortado" + maximum_staged_user_per_email_reached: "Alcanzado el número máximo de usuarios provisionales creados por email." errors: empty_email_error: "Sucede cuando el texto en bruto del email que recibimos está en blanco." no_message_id_error: "Sucede cuando el email no tiene Id del mensaje en el encabezado." @@ -44,7 +45,7 @@ es: reply_user_not_matching_error: "Sucede cuando una respuesta vino de una dirección de email diferente a la que fue enviada la notificación." topic_not_found_error: "Sucede cuando entró una respuesta pero el tema relacionado ha sido eliminado." topic_closed_error: "Sucede cuando entró una respuesta pero el tema relacionado ha sido cerrado. " - bounced_email_report: "El email es un reporte que ha rebotado." + bounced_email_error: "El email es un reporte de correo rebotado." auto_generated_email_reply: "El email contiene una respuesta a un correo autogenerado." screened_email_error: "Sucede cuando la dirección de email del remitente ya ha sido filtrada." errors: &errors @@ -1120,6 +1121,8 @@ es: default_categories_tracking: "Lista de categorías que están seguidas por defecto" default_categories_muted: "Lista de categorías que están silenciadas por defecto." tagging_enabled: "¿Activar etiquetas para los temas?" + min_trust_to_create_tag: "El mínimo nivel de confianza requerido para crear una etiqueta." + max_tags_per_topic: "El máximo número de etiquetas que se pueden añadir a un tema." errors: invalid_email: "Dirección de correo electrónico inválida. " invalid_username: "No existe ningún usuario con ese nombre de usuario. " diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 71f1642a117..a661f6aa450 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -24,7 +24,7 @@ fi: loading: "Lataa" powered_by_html: 'Voimanlähteenä Discourse, toimii parhaiten, kun JavaScript on käytössä' log_in: "Kirjaudu" - purge_reason: "Poistettu automaattisesti hylättynä, aktivoimattomana tilinä" + purge_reason: "Hylätty, aktivoimaton tili poistettiin automaattisesti" disable_remote_images_download_reason: "Linkattujen kuvien lataaminen poistettiin käytöstä vähäisen tallennustilan vuoksi." anonymous: "Anonyymejä" emails: @@ -172,7 +172,8 @@ fi: private_posts: "Uusimmat yksityisviestit" group_posts: "Uusimmat viestit ryhmässä %{group_name}" group_mentions: "Uusimmat maininnat ryhmässä %{group_name}" - tag: "Tagatut aiheet" + user_posts: "Viimeisimmät viestit käyttäjältä @%{username}" + user_topics: "Viimeisimmät ketjut käyttäjältä @%{username}" too_late_to_edit: "Tämä viesti luotiin liian kauan sitten. Sitä ei voi enää muokata tai poistaa." revert_version_same: "Nykyinen revisio on sama, kuin jonka yrität palauttaa." excerpt_image: "kuva" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 0180f61036b..ddf4c041b85 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -31,6 +31,7 @@ fr: incoming: default_subject: "Courriel arrivant de %{email}" show_trimmed_content: "Montrer le contenu raccourci" + maximum_staged_user_per_email_reached: "Vous avez atteint le nombre maximal d'utilisateurs qui peuvent être créés par mail." errors: empty_email_error: "Arrive quand le courriel reçu était vide." no_message_id_error: "Arrive quand le courrier n'a pas d'en-tête \"Message-Id\"." @@ -44,7 +45,7 @@ fr: reply_user_not_matching_error: "Arrive quand une réponse est venue d'une adresse de courriel différente de celle où a été envoyée la notification." topic_not_found_error: "Arrive quand quelqu'un répond à un sujet qui a été supprimé." topic_closed_error: "Arrive quand quelqu'un répond mais le sujet lié a été fermé." - bounced_email_report: "Le courriel est un rapport de courriel rejeté." + bounced_email_error: "Le courriel est un rapport de courriel rejeté." auto_generated_email_reply: "Email contient une réponse à un email automatiquement généré." screened_email_error: "Arrive quand l'adresse courriel de l'expéditeur est déjà sous surveillance." errors: &errors @@ -713,6 +714,9 @@ fr: site_contact_username_warning: "Saisissez le pseudo d'un responsable sympathique à partir duquel sera envoyé les messages importants. Mettez à jour site_contact_username dans les Paramètres du site." notification_email_warning: "Les courriels de notification ne serot pas envoyés depuis une adresse de courriel valide sur votre domaine ; l'envoie des courriels sera aléatoire et peu fiable. Veuillez saisir une adresse de courriel locale dans notification_email dans les Paramètres du site." subfolder_ends_in_slash: "Votre configuration de sous-répertoire est erronée; DISCOURSE_RELATIVE_URL_ROOT se termine avec une barre oblique ." + email_polling_errored_recently: + one: "La vérification des mails a généré une erreur au cours des 24 dernières heures. Vérifiez le journal pour plus de détails." + other: "La vérification des mails a généré %{count} erreurs au cours des 24 dernières heures. Vérifiez le journal pour plus de détails." bad_favicon_url: "Impossible de charger la favicon. Vérifiez le paramètre favicon_url dans les paramètres du site" site_settings: censored_words: "Mots qui seront automatiquement remplacés par ■■■■" @@ -1105,10 +1109,8 @@ fr: default_categories_watching: "Liste de catégories surveillées par défaut." default_categories_tracking: "Liste de catégories suivies par défaut." default_categories_muted: "Liste de catégories silencées par défaut." - tagging_enabled: "Autoriser les utilisateurs à mettre des tags sur les sujets ?" - min_trust_to_create_tag: "Le niveau de confiance requis pour créer un tag." - max_tags_per_topic: "Le nombre maximum de tags qui peuvent être ajouté à un sujet." - max_tag_length: "The nombre maximum de caractères qui peuvent être utilisés pour un tag." + tagging_enabled: "Activer les tags sur les sujets ?" + tag_style: "Style visuel pour tag badges." errors: invalid_email: "Adresse de courriel invalide." invalid_username: "Il n'y a pas d'utilisateur ayant ce pseudo." @@ -1929,6 +1931,7 @@ fr: avatar: missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse mail. Pouvez-vous essayer de la télécharger à nouveau ?" email_log: + post_user_deleted: "L'auteur du message a été supprimé." no_user: "Impossible de trouver l'utilisateur avec l'id %{user_id}" anonymous_user: "L'utilisateur est anonyme" suspended_not_pm: "L'utilisateur est suspendu, pas de message" @@ -2211,25 +2214,23 @@ fr: Ce badge est accordé lorsque vous utilisez tous les 50 de vos j'aime quotidiens. Rappelez-vous de prendre un moment pour aimer les messages qui vous plaisent et d'apprécier encourager vos membres de la communauté pour créer encore plus de grandes discussions à l'avenir. higher_love: name: Amour plus fort + description: A utilisé 50 likes en un jour 5 fois long_description: | Ce badge est accordé lorsque vous utilisez tous les 50 j'aime par jour pendant 5 jours. Merci de prendre le temps activement d'encourager les meilleures conversations chaque jour! crazy_in_love: name: Fou amoureux + description: A utilisé 50 likes en un jour 20 fois long_description: | Ce badge est accordé lorsque vous utilisez tous les 50 de vos j'aime par jour pendant 20 jours. Hou la la! Vous êtes un modèle de régulièrement encourager vos membres de la communauté! thank_you: name: 'Merci ' description: A 20 messages ayant reçu un j'aime et a donné 10 j'aime - long_description: "Ce badge vous est accordé quand vous avez reçu 20 j'aime sur vos messages et en avez donné 10 ou plus en retour. Quand quelqu'un aime vos messages, vous trouvez le temps d'aimer ce que les autres postent à leur tour. \n" gives_back: name: Redonne description: A 100 messages ayant reçu un j'aime et a donné 100 j'aime - long_description: | - Ce badge vous est accordé quand vous avez reçu 100 j'aime et en avez donné 100 ou plus en retour. Merci pour tout cela. empathetic: name: Empathique description: A 500 messages ayant reçu un j'aime et a donné 1000 j'aime - long_description: "Ce badge vous est accordé quand vous avez reçu 500 j'aime et en avez donné 1000 ou plus en retour. Whaou ! Vous êtes un modèle de générosité et d'amour mutuel :two_hearts:. \n" first_emoji: name: Premier Emoji description: A utilisé un emoji dans un message @@ -2253,9 +2254,10 @@ fr: initial_topic_title: Rapports de performances du site topic_invite: user_exists: "Désolé, cet utilisateur a déjà été invité. Vous ne pouvez inviter un utilisateur qu'une seule fois par sujet." + tags: + title: "Tags" time: <<: *datetime_formats activemodel: errors: <<: *errors - rss_by_tag: "Sujets portant le tag %{tag}" diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index a16c287bd09..c1f7e369b80 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -159,8 +159,16 @@ it: rss_description: latest: "Argomenti più recenti" hot: "Argomenti caldi" + top: "Argomenti di punta" posts: "Ultimi messaggi" + private_posts: "Ultimi messaggi privati" + group_posts: "Ultimi messaggi da %{group_name}" + group_mentions: "Ultime menzioni da %{group_name}" + user_posts: "Ultimi messaggi di @%{username}" + user_topics: "Ultimi argomenti di @%{username}" + tag: "Argomenti etichettati" too_late_to_edit: "Questo messaggio è stato creato troppo tempo fa. Non può più essere modificato né cancellato." + revert_version_same: "La versione attuale è la stessa versione che stai cercando di ripristinare." excerpt_image: "immagine" queue: delete_reason: "Cancellato attraverso la coda di moderazione" @@ -169,6 +177,7 @@ it: can_not_modify_automatic: "Non puoi modificare un gruppo automatico" member_already_exist: "'%{username}' è già membro di questo gruppo." invalid_domain: "'%{domain}' non è un dominio valido." + invalid_incoming_email: "'%{email}' non è un indirizzo email valido." default_names: everyone: "chiunque" admins: "amministratori" @@ -728,7 +737,7 @@ it: share_links: "Determina quali elementi appaiono nella finestra di condivisione e in quale ordine." track_external_right_clicks: "Segui i collegamenti esterni sui quali viene fatto click destro (es: apri in una nuova tab). Disabilitato di default perché riscrive le URL" site_contact_username: "Un utente dello staff valido da cui inviare tutti i messaggi automatici. Se lasciato vuoto verrà usato l'account System di default." - send_welcome_message: "nvia a tutti i nuovi utenti un messaggio di benvenuto con una guida di avvio rapido." + send_welcome_message: "Invia a tutti i nuovi utenti un messaggio di benvenuto con una guida di avvio rapido." suppress_reply_directly_below: "Non mostrare il conteggio espandibile delle risposte quando c'è una sola risposta sotto quel messaggio." suppress_reply_directly_above: "Non mostrare in-risposta-a espandibile in un messaggio quando c'è una sola risposta sopra quel messaggio. " suppress_reply_when_quoting: "Non mostrare in-risposta-a espandibile in un messaggio quando il messaggio include la citazione." @@ -1273,6 +1282,10 @@ it: privacy_topic: title: "Politica della Privacy" badges: + welcome: + description: Hai ricevuto un Mi piace + great_topic: + description: Hai ricevuto 50 Mi piace su 1 argomento first_like: name: Primo "Mi piace" description: Ha messo "Mi piace" a un messaggio @@ -1286,11 +1299,21 @@ it: name: Primo Collegamento first_quote: description: Ha citato un messaggio + appreciated: + description: Hai ricevuto 1 Mi piace su 20 messaggi + respected: + description: Hai ricevuto 2 Mi piace su 100 messaggi + admired: + description: Hai ricevuto 5 Mi piace su 300 messaggi admin_login: success: "email Inviata" error: "Errore!" email_input: "Email Amministratore" submit_button: "Invia Email" + tags: + title: "Etichette" + staff_tag_remove_disallowed: "L'etichetta \"%{tag}\" può essere cancellata soltanto dallo staff." + rss_by_tag: "Argomenti etichettati %{tag}" time: <<: *datetime_formats activemodel: diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index 0bd2d5b1ce4..748537b6a32 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -9,7 +9,7 @@ ja: dates: short_date_no_year: "MMM D" short_date: "YYYY MMM D" - long_date: "MMMM D, YYYY h:mma" + long_date: "YYYY MMMM D h:mma" date: month_names: [null, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月] title: "Discourse" @@ -23,20 +23,21 @@ ja: emails: incoming: default_subject: "%{email}からメール" + show_trimmed_content: "続きを読む" errors: &errors format: '%{attribute} %{message}' messages: too_long_validation: "は、最大文字数(%{max}文字)を超えています。(入力したのは%{length}文字 ) " - invalid_boolean: "無効なboolean." + invalid_boolean: "無効な選択肢" taken: "は既に使用されています" accepted: に同意する必要があります blank: を入力してください present: は入力しないでください confirmation: "と%{attribute}の入力が一致しません" - empty: 本文が未入力です。. + empty: 本文が入力されていません equal_to: は%{count}にしてください even: は偶数にしてください - exclusion: は予約されています + exclusion: はすでに使われています greater_than: は%{count}より大きい値にしてください greater_than_or_equal_to: は%{count}以上の値にしてください has_already_been_used: "は既に使用されています" @@ -74,7 +75,7 @@ ja: not_logged_in: "ログインしてください。" not_found: "リクエストされたURL、リソースは見つかりませんでした" invalid_access: "リクエストしたリソースの閲覧が許可されていません" - read_only_mode_enabled: "このサイトは読み取り専用モードです。会話は無効になっています。" + read_only_mode_enabled: "このサイトは閲覧専用状態です。変更などの操作は無効になっています。" too_many_replies: other: "申し訳ありません、新しいユーザーの同じトピックへの返信は、一時的に %{count} 回に制限されています。" embed: @@ -82,12 +83,14 @@ ja: continue: "議論を続ける" more_replies: other: "%{count} 以上の返信" - loading: "会話をロードしています…" + loading: "会話を読み込んでいます…" permalink: "パーマリンク" imported_from: "これは、オリジナルエントリ%{link}に対するディスカッショントピックです" in_reply_to: "▶ %{username}" replies: other: "%{count} 通の返信" + no_mentions_allowed: "あなたは他のユーザへメンションを送ることができません。" + no_images_allowed: "新規ユーザは投稿に画像を付ける事はできません。" spamming_host: "申し訳ありませんが、このホストへのリンクを貼ることはできません。" user_is_suspended: "アカウントが凍結中のユーザーは投稿ができません。" topic_not_found: "問題が発生しました。トピックがクローズしたか、閲覧中に削除された可能性があります。" @@ -108,9 +111,10 @@ ja: read_full_topic: "完全なトピックを読む" private_message_abbrev: "メッセージ" rss_description: - latest: "最新トピック" + latest: "最新のトピック" hot: "ホットトピック" posts: "最近の投稿" + private_posts: "最新のプライベートメッセージ" too_late_to_edit: "この投稿の編集・削除期間が過ぎました。編集・削除が出来ません。" excerpt_image: "画像" queue: @@ -161,11 +165,12 @@ ja: 回答を追加する代わりに、以前の回答を編集するか、別のトピックを訪れる事を検討してください。 reviving_old_topic: | - ### このトピックを復活させますか？ + ### このトピックを復活させてもよろしいですか？ - このトピックの最後の回答は%{days}日前です。あなたの回答はトピックを一覧のトップに上げて、以前回答した誰がか気付きます。 + このトピックへの最後の返信は%{days}日前です。 + あなたの返信はトピック一覧の一番上に移動させ、以前に返信した人宛に通知が送られます。 - 本当に過去の議論を続けますか？ + 本当に過去の会話を復元してもよろしいですか？ activerecord: attributes: category: @@ -209,7 +214,7 @@ ja: lounge_welcome: title: "ラウンジへようこそ" category: - topic_prefix: "%{category} カテゴリの定義" + topic_prefix: "%{category}カテゴリについて" errors: uncategorized_parent: "未分類カテゴリは親カテゴリに設定出来ません。" self_parent: "自分自身がサブカテゴリの親になることはできません" @@ -222,7 +227,7 @@ ja: topic_exists_no_oldest: "%{count}個のトピックを持っているため、このカテゴリを削除できません。" trust_levels: newuser: - title: "新規ユーザ" + title: "新しいユーザ" basic: title: "ベーシックユーザ" change_failed_explanation: "%{user_name} を '%{new_trust_level}' に格下げしようとしましたが、既にトラストレベルが '%{current_trust_level}' です。%{user_name} は '%{current_trust_level}' のままになります - もしユーザーを降格させたい場合は、トラストレベルをロックしてください" @@ -236,15 +241,15 @@ ja: other: "%{count} 秒" datetime: distance_in_words: - half_a_minute: "< 1分" + half_a_minute: "1分前" less_than_x_seconds: other: "< %{count} 秒" x_seconds: other: "%{count} 秒" less_than_x_minutes: - other: "< %{count} 分" + other: "%{count}分前" x_minutes: - other: "%{count} 分" + other: "%{count}分" about_x_hours: other: "%{count} 時間" x_days: @@ -266,9 +271,9 @@ ja: x_seconds: other: "%{count} 秒前" less_than_x_minutes: - other: "%{count} 分未満" + other: "%{count}分未満" x_minutes: - other: "%{count} 分前" + other: "%{count}分前" about_x_hours: other: "%{count} 時間前" x_days: @@ -534,7 +539,7 @@ ja: title_nag: "サイトの名前が正しくありません。サイトの設定で更新してください" site_description_missing: "検索結果に表示される説明文を入力してください。サイトの設定で更新してください" consumer_email_warning: "サイトはメール送信に Gmail (または他のカスタムメールサービス) を利用するように設定されています。Gmail で送信可能なメール数には制限があります。メールを確実に送信するために mandrill.com などのメールサービスプロバイダーの利用を検討してください。" - site_contact_username_warning: "重要な自動メッセージを送信するフレンドリースタッフユーザーアカウントの名前を入力してください。サイト設定 のsite_contact_username を更新してください。" + site_contact_username_warning: "重要なメッセージを送るために、スタッフユーザの名前を入力してください。サイト設定 のsite_contact_username を更新してください。" notification_email_warning: "通知用メールがあなたのドメインで有効なメールアドレスから送信されていません。メール配信が不安定になり、信頼性が低くなります。\nサイトの設定で更新してください" site_settings: censored_words: "自動的に ■■■■ で置換されます" @@ -583,12 +588,12 @@ ja: notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive." email_custom_headers: "カスタムメールヘッダのリスト (パイプ(バーティカルバー) 区切り)" email_subject: "標準のメールタイトルをカスタマイズできます。https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801 を参照してください" - use_https: "サイトのURL(Discourse.base_url)をhttpかhttpsにしますか？ \"既に設定が完了し、動作していない限り、HTTPSは選択しないでください!\"" summary_score_threshold: "'トピックサマリー'に投稿が含まれるために必要な最低スコア" summary_posts_required: "'トピックサマリー'が有効になるために必要な最小投稿数" summary_likes_required: "'トピックサマリー'が有効になるために必要な最小「いいね!」数" summary_percent_filter: "ユーザが'トピックサマリー'をクリックしたとき, 上位何パーセントのポストを表示するか" summary_max_results: "'トピックサマリー'として返却される最大ポスト数" + enable_private_messages: "トラストレベル1のユーザにメッセージの作成と返信を許可する(最小のトラストレベルを介して設定可能なメッセージを送信します)" enable_long_polling: "通知用のメッセージバスによるロングポーリングの利用を許可する" long_polling_base_url: "ロングポーリングのベースURL(CDNが動的コンテンツを配信している場合、これをoriginに指定してください) eg: http://origin.site.com" long_polling_interval: "ユーザに送信するデータが存在しないとき、サーバが待機する時間(ログインユーザーのみ)" @@ -601,7 +606,7 @@ ja: tl2_additional_likes_per_day_multiplier: "この数字を掛けると TL2 (メンバー) の1日あたりの「いいね！」の上限を増やします" tl3_additional_likes_per_day_multiplier: "この数字を掛けると TL3 (レギュラー) の1日あたりの「いいね！」の上限を増やします" tl4_additional_likes_per_day_multiplier: "この数字を掛けると TL4 (リーダー) の1日あたりの「いいね！」の上限を増やします" - num_flags_to_block_new_user: "新規ユーザの投稿に対して、何人のユーザによりここで指定した数のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化" + num_flags_to_block_new_user: "もし新しいユーザがnum_users_to_block_new_userで定義されている数の通報を受けたらそれらの投稿を全て非表示にし、今後の投稿をブロックします。0で無効にします。" num_users_to_block_new_user: "新規ユーザのポストに対して、ここで指定した数のユーザにより何個のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化" notify_mods_when_user_blocked: "ユーザが自動的にブロックされた際に、すべてのモデレータにメッセージを送信する。" flag_sockpuppets: "トピックを作成したユーザーと同じIPアドレスで、新規ユーザーがトピックに回答した場合、両者を潜在的なスパムとしてフラグを立てるか" @@ -615,7 +620,7 @@ ja: enable_noscript_support: "noscript タグ経由でアクセスしてきた標準サーチエンジンクローラのサポートを有効にする" allow_moderators_to_create_categories: "モデレータのカテゴリ作成を許可" cors_origins: "CORSを許可。オリジンはhttp://かhttps://を含む必要があります。CORSを有効にするには、環境変数　DISCOURSE_ENABLE_CORSにtrueをセットする必要があります" - top_menu: "ホームナビゲーゲションに表示する項目、表示順を指定。例: latest|new|unread|categories|top|read|posted|bookmarks" + top_menu: "ホームナビゲーションに表示する項目・表示順を指定。例: latest|new|unread|categories|top|read|posted|bookmarks" post_menu: "投稿メニューに表示する項目を指定。例 like|edit|flag|delete|share|bookmark|reply" post_menu_hidden_items: "開くボタンをクリックするまで投稿のメニュー項目を隠します" share_links: "シェアダイアログに表示する項目、表示順を指定" @@ -632,13 +637,13 @@ ja: show_email_on_profile: "プロフィールのメールアドレスを表示(自分とスタッフのみ閲覧できます)" email_token_valid_hours: "パスワードリマインダ、アカウントアクティベート時のトークンを何時間有効にするか" email_token_grace_period_hours: "パスワードリマインダ、アカウントアクティベート時のトークンを無効するときに、何時間猶予を与えるか" - enable_badges: "バッジシステムを有効にする" + enable_badges: "バッジ機能を有効にする" allow_index_in_robots_txt: "サーチエンジンにインデックスを許可するようにrobots.txtを指定する" email_domains_blacklist: "ユーザーがアカウント登録をすることができない、パイプ区切りのドメイン名のリスト。 例 : mailinator.com|trashmail.net" email_domains_whitelist: "ユーザー登録に必要なパイプ区切りのメールドメインのリスト。警告: 指定したメールドメイン以外のユーザは許可されません！" forgot_password_strict: "パスワードリマインダダイアログで、アカウントの存在を通知しない" log_out_strict: "ログアウトした際に、そのユーザーの全デバイスのセッションをログアウトさせる" - version_checks: "Discourse Hub にアップデート、新バージョンの有無を問い合わせ /admin ダッシュボードにバージョンメッセージを表示する" + version_checks: "Discourse Hubからのアップデートを確認し、管理ページにバージョンやアップデートメッセージを表示する" new_version_emails: "Discourseの新しいバージョンが利用可能になった際に contact_email アドレスにメールで通知する" port: "開発者用! 警告! デフォルトの80番ポートではなく、ここで指定した HTTP ポートを利用する。空欄でデフォルトの80番ポートを利用。" force_hostname: "開発者用! 警告! URL 内のホスト名を指定。空欄でデフォルト値を利用。" @@ -658,7 +663,7 @@ ja: sso_overrides_avatar: "SSOペイロードから取得した外部サイトのプロフィール画像でローカルのプロフィール画像を上書きする。有効にする場合、プロフィール画像のアップデートを無効にする事を強く薦めます" sso_not_approved_url: "このURLに承認されていないSSOアカウントをリダイレクト" enable_local_logins: "ローカルのユーザ名、パスワードでのログインを有効にする (注意: 招待を使用するには有効にする必要があります)" - allow_new_registrations: "新規ユーザー登録を許可。誰でもユーザーを作れるのを防ぐには、チェックを外してください。" + allow_new_registrations: "新しいユーザの登録を許可。ユーザを誰でも作れないようにするためには、チェックを外してください。" enable_yahoo_logins: "Yahoo 認証を有効にする" enable_google_oauth2_logins: "グーグル Oauth2 認証を有効にします。これはグーグルが現在サポートしている認証方式です。key と secret が必要です。" google_oauth2_client_id: "あなたのGoogleアプリケーションのクライアントID" @@ -678,12 +683,12 @@ ja: enable_s3_backups: "完了時にS3にバックアップをアップロードします。重要: 有効なS3 credentialsがファイル設定に必要です" s3_backup_bucket: "バックアップを保持するバケット。　警告: 必ずプライベートバケットになっていることを確認してください" active_user_rate_limit_secs: "'last_seen_at' フィールドを更新する頻度 (秒)" - verbose_localization: "ローカライゼーションtipsを展開するUIを表示する" + verbose_localization: "翻訳者向けの機能を表示をします" previous_visit_timeout_hours: "'previous' visit とみなす時間 (時間)" rate_limit_create_topic: "トピック作成後、次のトピックを作成するまでにユーザが待たなければならない時間 (秒)" rate_limit_create_post: "ポスト投稿後、次のポストを投稿するまでにユーザが待たなければならない時間 (秒)" - rate_limit_new_user_create_topic: "トピック作成後、次のトピックを作成するまでに新規ユーザが待たなければならない時間 (秒)" - rate_limit_new_user_create_post: "ポスト投稿後、次のポストを投稿するまでに新規ユーザが待たなければならない時間 (秒)" + rate_limit_new_user_create_topic: "新しいユーザがトピックを作った後、次のトピックが作成できるまでの時間(秒)" + rate_limit_new_user_create_post: "投稿後、次のポストを投稿するまでに新しいユーザが待たなければならない時間 (秒)" max_likes_per_day: "ユーザが一日に「いいね！」できる最大数" max_flags_per_day: "ユーザが一日に行える通報の回数" max_bookmarks_per_day: "ユーザが一日にブックマークできる最大数" @@ -725,11 +730,11 @@ ja: tl3_links_no_follow: "トラストレベル3のユーザのポスト内のrel=nofolowを削除しない" min_trust_to_create_topic: "新規にトピックを作成するために必要な最低トラストレベル。" min_trust_to_edit_wiki_post: "ポストをwikiにするために必要な最低トラストレベル" - newuser_max_links: "新規ユーザがポスト内に作成できるリンクの数" - newuser_max_images: "新規ユーザがポスト内にアップロードできる画像の数" - newuser_max_attachments: "新規ユーザがポスト内に添付できるファイルの数" - newuser_max_mentions_per_post: "新規ユーザがポスト内で @name で通知できる最大数" - newuser_max_replies_per_topic: "新規ユーザが１つのトピックで誰かがそれに回答するまでに回答できる最大数" + newuser_max_links: "新しいユーザが投稿内に貼れるリンクの数" + newuser_max_images: "新しいユーザが投稿内にアップロードできる画像の数" + newuser_max_attachments: "新しいユーザが投稿内に添付できるファイルの数" + newuser_max_mentions_per_post: "新しいユーザが投稿内で @name で通知できる最大の数" + newuser_max_replies_per_topic: "新しいユーザが１つのトピックで誰かがそれに回答するまでに回答できる最大の数" max_mentions_per_post: "ユーザがポスト内で@name で通知できる最大数" create_thumbnails: "大きすぎる画像はポストにフィットするように、サムネイルを作成しlightbox 画像を作成する" email_time_window_mins: "ユーザによるポストの最終編集チャンスを与えるために、通知用メール送信までに待つ時間 (分)" @@ -760,7 +765,7 @@ ja: topic_post_like_heat_low: "いいね数/ ポスト数の比率がこの比率を超えると、ポスト数のフィールドがやや強調されます" topic_post_like_heat_medium: "いいね数/ ポスト数の比率がこの比率を超えると、ポスト数のフィールドが適度に強調されます" topic_post_like_heat_high: "いいね数/ ポスト数の比率がこの比率を超えると、ポスト数のフィールドが強く強調されます" - faq_url: "他サイトに FAQ をホストしている場合は、フル URL をここに指定。" + faq_url: "FAQが他のサイトにある場合、URLをここに指定します。" tos_url: "他サイトに利用規約をホストしている場合は、フル URL をここに指定。" privacy_policy_url: "他サイトにプライバシーポリシーをホストしている場合は、フル URL を個々に指定。" white_listed_spam_host_domains: "スパムホスト検査から除外するドメインのリスト。新規ユーザはこれらのドメインでポスト内にリンクを作成することを制限されません" @@ -806,9 +811,9 @@ ja: allow_animated_thumbnails: "アニメgifからアニメーションサムネイルを生成する" default_avatars: "新規ユーザが変更するまで使用されるデフォルトのプロフィール画像URL" automatically_download_gravatars: "アカウントの生成時、メールアドレスの変更時にGravatarをダウンロード" - digest_topics: "ダイジェストメールに表示されるトピックの最大数" - digest_min_excerpt_length: "ダイジェストメール内の投稿の抜粋の最小文字数" - disable_digest_emails: "全てのユーザのダイジェストメールを無効にする" + digest_topics: "まとめメールに表示されるトピックの最大数" + digest_min_excerpt_length: "まとめメール内の投稿の抜粋の最小文字数" + disable_digest_emails: "すべてのユーザのまとめメールを無効にする" detect_custom_avatars: "ユーザがプロフィール画像をアップロードしたか確認する" max_daily_gravatar_crawls: "Discourseがプロフィール画像の確認をgravastarに行う回数の上限" public_user_custom_fields: "パブリックに公開されるカスタムフィールドのホワイトリスト" @@ -839,7 +844,7 @@ ja: embed_by_username: "embedされたトピックの作成者として表示されるDiscourseユーザー名" embed_username_key_from_feed: "フィードからDsicourseユーザ名をプルするキー" embed_truncate: "embedされた投稿をtruncateする" - embed_post_limit: "embedで表示する投稿の最大数" + embed_post_limit: "表示可能な投稿の最大数を埋め込む" embed_whitelist_selector: "embedを許可するエレメントのCSS Selector" embed_blacklist_selector: "embedから削除するエレメントのCSS Selector" notify_about_flags_after: "この数時間後に処理されていない通報がある場合は、contact_emailにメールを送信する。0を設定すると無効になります" @@ -852,6 +857,7 @@ ja: emoji_set: "How would you like your emoji?" enforce_square_emoji: "絵文字のアスペクト比を強制的に揃える" approve_unless_trust_level: "トラストレベル以下のユーザーの投稿には承認が必要" + default_email_previous_replies: "デフォルトでメールの文章に以前の返信を含める" errors: invalid_email: "不正なメールアドレスです" invalid_username: "そのユーザ名のユーザは存在しません" @@ -894,7 +900,7 @@ ja: not_seen_in_a_month: "お帰りなさい！　最近見かけませんでしたね。　これらがあなたが離れてから最も人気のトピックです" move_posts: new_topic_moderator_post: - other: "%{count} 件のポストを新しいトピックに分割しました: %{topic_link}" + other: "%{count}件の投稿を新しいトピックに分割しました: %{topic_link}" existing_topic_moderator_post: other: "%{count} 件のポストを既存のトピックにマージしました: %{topic_link}" change_owner: @@ -945,7 +951,7 @@ ja: something_already_taken: "エラーが発生しました。ユーザ名またはメールアドレスが既に使用中の可能性があります。パスワードリセットを行ってください。" omniauth_error: "あなたの アカウントの認可に失敗しました。アカウントの認可を許可したか確認してください" omniauth_error_unknown: "ログインに失敗しました。もう一度試してください。" - new_registrations_disabled: "新規登録は、この時点で許可されていません" + new_registrations_disabled: "新規登録は現在行えません。" password_too_long: "パスワードは200文字までです" email_too_long: "メールアドレスが長過ぎます。アドレス部は254文字以内に、ドメイン部は253文字以内にする必要があります" reserved_username: "そのユーザー名は許可されていません" @@ -964,7 +970,7 @@ ja: blocked: "は許可されていません。" ip_address: blocked: "あなたのIPアドレスからの新規登録は許可されていません" - max_new_accounts_per_registration_ip: "あなたのIPアドレスからの新規登録は許可されていません(最大数に達しました)。スタッフメンバーに連絡してください" + max_new_accounts_per_registration_ip: "あなたのIPアドレスからの新規登録は行えません(登録可能な数を超えています)。スタッフへお問い合わせください。" flags_reminder: subject_template: other: "%{count}件の通報が対応待ちです" @@ -1002,9 +1008,36 @@ ja: test_mailer: subject_template: "[%{site_name}] メール送信テスト" new_version_mailer: - subject_template: "[%{site_name}] New Discourse version, update available" + subject_template: "[%{site_name}] Discourseの新しいバージョンがあります。" + text_body_template: | + 最新版の[Discourse](http://www.discourse.org)が利用出来ます！ + + 現在利用しているバージョン: %{installed_version} + 新しいバージョン: **%{new_version}** + + - 更新は**[ワンクリックブラウザ・アップグレード](%{base_url}/admin/upgrade)**から簡単にできます。 + + - 更新内容は[GitHubの更新履歴](https://github.com/discourse/discourse/commits/master)をご覧ください。 + + - [meta.discourse.org](http://meta.discourse.org)にて、Discourseに関するお知らせ、話し合い、サポートを行っています。 new_version_mailer_with_notes: - subject_template: "[%{site_name}] update available" + subject_template: "[%{site_name}] アップデートがあります" + text_body_template: |+ + 最新版の[Discourse](http://www.discourse.org)が利用出来ます！ + + 現在利用しているバージョン: %{installed_version} + 新しいバージョン: **%{new_version}** + + - 更新は**[ワンクリックブラウザ・アップグレード](%{base_url}/admin/upgrade)**から簡単にできます。 + + - 更新内容は[GitHubの更新履歴](https://github.com/discourse/discourse/commits/master)をご覧ください。 + + - [meta.discourse.org](http://meta.discourse.org)にて、Discourseに関するお知らせ、話し合い、サポートを行っています。 + + ### リリースノート + + %{notes} + queued_posts_reminder: subject_template: other: "[%{site_name}] %{count} 件の投稿がレビュー待ちです" @@ -1058,7 +1091,7 @@ ja: ``` restore_succeeded: subject_template: "復元が正常に完了しました" - text_body_template: "復元に成功しました" + text_body_template: "復元が完了しました。" restore_failed: subject_template: "復元に失敗しました" text_body_template: | @@ -1083,7 +1116,7 @@ ja: %{logs} ``` csv_export_succeeded: - subject_template: "データ出力完了" + subject_template: "データのダウンロード準備が完了しました" text_body_template: | データ出力が完了しました! :dvd: @@ -1091,8 +1124,8 @@ ja: このダウンロードリンクは48時間有効です csv_export_failed: - subject_template: "データ出力失敗" - text_body_template: "申し訳ありません。データ出力に失敗しました。ログを確認するかスタッフメンバーに連絡してください" + subject_template: "データのエクスポートに失敗しました" + text_body_template: "申し訳ありません。データのエクスポートに失敗しました。ログを確認するかスタッフメンバーにお問い合わせください。" email_reject_no_account: subject_template: "[%{site_name}] Email issue -- 不明なアカウント" email_reject_empty: @@ -1152,16 +1185,18 @@ ja: subject_template: "[%{site_name}] [プライベートメッセージ] %{topic_title}" digest: why: "あなたが最後にアクセスした %{last_seen_at} 以降の %{site_link} のまとめです" - subject_template: "[%{site_name}] ダイジェスト" + subject_template: "[%{site_name}] のまとめ" new_activity: "あなたのトピックおよびポストにおけるアクティビティ:" top_topics: "人気の投稿" other_new_topics: "人気のトピック" - unsubscribe: "このダイジェストは、あなたからのアクセスがしばらくない場合、%{site_link}から送信されます。配信停止はこちら %{unsubscribe_link}" + unsubscribe: "このまとめは、サイトへのアクセスが一定期間無い場合に、%{site_link}から送られます。配信停止はこちらから行えます: %{unsubscribe_link}" click_here: "ここをクリック" - from: "%{site_name} ダイジェスト" + from: "%{site_name} のまとめ" read_more: "もっと読む" more_topics: " %{new_topics_since_seen}個の新しいトピックがありました" more_topics_category: "もっと新しいトピック:" + mailing_list: + new_topics: "新着トピック" forgot_password: subject_template: "[%{site_name}] パスワードのリセット" text_body_template: | @@ -1189,6 +1224,12 @@ ja: 以下のリンクをクリックしてパスワードを設定してください: %{base_url}/users/password-reset/%{email_token} + confirm_new_email: + subject_template: "[%{site_name}] 新しいメールアドレスを確認してください" + text_body_template: | + 以下のリンクをクリックして、%{site_name}で利用するメールアドレスを有効化してください: + + %{base_url}/users/authorize-email/%{email_token} signup_after_approval: subject_template: "%{site_name} への参加承認完了!" signup: @@ -1196,11 +1237,12 @@ ja: text_body_template: | Welcome to %{site_name}! - 次のリンクをクリックして、新たなアカウントの承認およびアクティベーションを行ってください: + リンクをクリックして、アカウントを有効化してください: %{base_url}/users/activate-account/%{email_token} もし、上記のURLがクリックできない場合は、ブラウザのアドレスバーへURLをコピーして貼り付けて下さい。 page_not_found: + title: "ページが見つからないか、アクセス出来ない場所にあります。" popular_topics: "人気" recent_topics: "最新" see_more: "もっと見る" @@ -1248,19 +1290,73 @@ ja: csv_export: boolean_yes: "はい" boolean_no: "いいえ" - static_topic_first_reply: |+ + static_topic_first_reply: | %{page_name}ページのコンテンツを編集するには、このトピックの最初の投稿を編集してください - guidelines_topic: - title: "よくある質問/コミュニティガイドライン" + title: "FAQ/ガイドライン" tos_topic: title: "利用規約" privacy_topic: title: "プライバシーポリシー" + static: + search_help: | +

マメ知識

+

+

    +
  • 検索はタイトルが優先されます。 – 迷った時はタイトルを調べてみましょう。
    • +
  • 調べたい物特有の、他にはない言葉で調べると良いでしょう。
    • +
  • 特定のカテゴリ、トピック、ユーザーページにて検索してみましょう。
    • +
+

+

オプション

+

+ + + + + + + +
order:viewsorder:latestorder:likes@usernameuser:foo
status:openstatus:closedstatus:archivedstatus:norepliesstatus:single_user
#category-slugcategory:foogroup:foobadge:foo
in:likesin:postedin:watchingin:trackingin:private
in:bookmarksin:firstin:pinnedin:unpinnedin:wiki
posts_count:numbefore:days or dateafter:days or date
+

+

サンプル

+

+

    +
  • rainbows #parks で、"parks"カテゴリの"rainbows"という言葉を含むトピックを検索します。
    • +
  • rainbows category:parks status:open order:latest 最終投稿の日付順に並べ替え、”parks”カテゴリの"rainbows"を含むクローズ/アーカイブされていないトピックを検索します。
    • +
  • rainbows category:"parks and gardens" in:bookmarks ブックマークされている"parks and gardens"カテゴリの中で、"rainbows"という言葉を含むトピックを検索します。
    • +
+

badges: + editor: + name: 編集者 + description: 最初の投稿を編集する + autobiographer: + name: あなたはだれ？ + description: プロフィールをすべて書く + nice_post: + name: ナイスな返事 + good_post: + name: イカす返事 + great_post: + name: 素晴らしい返事 + nice_topic: + name: ナイスなトピック + good_topic: + name: イカすトピック first_flag: name: はじめの通報 description: 通報した投稿 + read_guidelines: + description: ガイドラインを読む + popular_link: + name: 人気のリンク + hot_link: + name: ウワサのリンク + famous_link: + name: 伝説のリンク + first_emoji: + name: はじめての絵文字 admin_login: success: "メールを送信しました" error: "エラー！" diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index 35f64b1d651..eb4c8272dad 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -24,7 +24,7 @@ pt: loading: "A carregar" powered_by_html: 'Desenvolvido por Discourse, e melhor visualizado com o JavaScript ativo' log_in: "Iniciar Sessão" - purge_reason: "Automaticamente eliminado devido a abandono, conta inativada" + purge_reason: "Conta removida automaticamente como conta abandonada, desactivada." disable_remote_images_download_reason: "O download remoto de imagens foi desativado por não haver espaço disponível no disco." anonymous: "Anónimo" emails: @@ -35,7 +35,7 @@ pt: empty_email_error: "Acontece quando, a informação não processada, do email recebido veio em branco." no_message_id_error: "Acontece quando o email recebido não tem 'Message-Id' no cabeçalho da mensagem." auto_generated_email_error: "Acontece quando o cabeçalho 'precedence' é definida como: 'list', 'junk' ou 'auto_reply', ou quando algum cabeçalho contém: 'auto-submitted', 'auto-replied' ou 'auto-generated'." - no_body_detected_error: "Acontece quando não conseguimos extrair o corpo da mensagem e não existem anexos." + no_body_detected_error: "Acontece quando não se consegue obter um corpo de mensagem e não existem anexos." inactive_user_error: "Acontece quando o remetente não está activo." blocked_user_error: "Acontece quando o remetente está bloqueado." bad_destination_address: "Acontece quando nenhum dos endereços de email nos campos para/cc/bcc coincide com um endereço de email configurado." @@ -44,6 +44,9 @@ pt: reply_user_not_matching_error: "Acontece quando uma resposta veio de um endereço de email diferente do destinatário da notificação." topic_not_found_error: "Acontece quando a resposta veio de um tópico relacionado mas o tópico relacionado foi apagado." topic_closed_error: "Acontece quando uma resposta chegou mas o tópico relacionado foi fechado." + bounced_email_error: "O email é um relatório devolvido." + auto_generated_email_reply: "O email contém uma resposta a um email gerado automaticamente." + screened_email_error: "Acontece quando a morada de email da pessoa que enviou já foi confirmada." errors: &errors format: '%{attribute} %{message}' messages: @@ -174,6 +177,7 @@ pt: group_mentions: "Últimas menções em %{group_name}" user_posts: "Mensagens mais recentes criados por @%{username}" user_topics: "Tópicos mais recentes criados por @%{username}" + tag: "Tópicos etiquetados" too_late_to_edit: "Essa mensagem foi criada há muito tempo. Já não pode ser editada ou apagada." revert_version_same: "A versão atual é o mesma versão para a qual você está tentando reverter." excerpt_image: "imagem" @@ -181,7 +185,7 @@ pt: delete_reason: "Eliminado através da fila de moderação de mensagens" groups: errors: - can_not_modify_automatic: "Não pode modificar um grupo automático" + can_not_modify_automatic: "Não pode modificar um grupo automatico" member_already_exist: "'%{username}' já é membro deste grupo." invalid_domain: "'%{domain}' não é um domínio válido." invalid_incoming_email: "'%{email}' não é um endereço de email válido." @@ -475,7 +479,7 @@ pt: continue_button: "Continuar para %{site_name}" welcome_to: "Bem-vindo a %{site_name}!" approval_required: "Um moderador tem que aprovar a sua conta antes de poder aceder a este fórum. Irá receber um email quando a sua conta for aprovada!" - missing_session: "Não conseguimos detetar se a sua conta foi criada, por favor assegure-se que tem os cookies ativos." + missing_session: "Não conseguimos detectar se a sua conta foi criada, pelo que pedimos que confirme que tem os cookies possibilitados." post_action_types: off_topic: title: 'Fora de Contexto' @@ -721,6 +725,9 @@ pt: email_polling_errored_recently: one: "A consulta automática de emails gerou um erro nas últimas 24 horas. Consulte em os registos para mais detalhes." other: "A consulta automática de emails gerou %{count} erros nas últimas 24 horas. Consulte em os registos para mais detalhes." + bad_favicon_url: "Não estamos a conseguir carregar o favicon. Pot favor, confirme a sua configuração favicon_url nas Configurações do sítio." + poll_pop3_timeout: "A tentativa de ligação ao servidor POP3 está a ultrapassar o tempo máximo. Email de caixa de entrada não pôde ser obtido. Por favor verifique a sua configuração de POP3 e fornecedor de serviço internet." + poll_pop3_auth_error: "A tentativa de ligação ao servidor POP3 está a falhar por motivos de erro de autenticação. Por favor verifique a sua configuração de POP3." site_settings: censored_words: "Palavras que serão automaticamente substituídas por ■■■■" delete_old_hidden_posts: "Eliminar automaticamente quaisquer mensagens ocultas que permaneçam escondidas por mais de 30 dias." @@ -765,6 +772,7 @@ pt: post_onebox_maxlength: "Tamanho máximo de uma mensagem Discourse de caixa única, em caracteres." onebox_domains_whitelist: "Lista de domínios que permitem colocar em caixa única; estes domínios devem suportar OpenGraph ou oEmbed. Teste-os em http://iframely.com/debug" logo_url: "A imagem do logótipo no canto superior esquerdo do seu sítio, deve ter uma forma retangular. Quando deixada em branco, o texto do título do sítio será exibido." + digest_logo_url: "O logotipo alternativo usado no topo do email de resumo do seu sítio. Deve ter um formato rectangular amplo. Não pode ser uma imagem em formato SVG. Se deixado em branco, `logo_url` será utilizado." logo_small_url: "A pequena imagem do logótipo no canto superior esquerdo do seu sítio, deve ter uma forma quadrada, visível quando arrastado para baixo. Quando deixado em branco, um glifo de início será exibido." favicon_url: "Um favicon para o seu sítio, veja http://en.wikipedia.org/wiki/Favicon, para trabalhar corretamente sobre um CDN deve ser um png" mobile_logo_url: "A imagem do logótipo com posição fixa utilizada no canto superior esquerdo do seu sítio móvel deve ter uma forma quadrada. Quando deixado em branco, `logo_url` será utilizado. ex: http://exemplo.com/uploads/default/logo.png" @@ -785,6 +793,7 @@ pt: polling_interval: "Quando não está a ocorrer uma solicitação ao servidor, com que frequência devem os clientes ligados requerer uma atualização, em milissegundos" anon_polling_interval: "Com que frequência os clientes não registados podem fazer solicitações ao servidor, em milisegundos" background_polling_interval: "Com que frequência deverão os clientes solicitar o servidor, em milissegundos (quando a janela está em plano de fundo)" + flags_required_to_hide_post: "Número de bandeiras que fazem com que uma mensagem seja automaticamente escondida e uma mensagem enviada ao utilizador (0 se nunca)" cooldown_minutes_after_hiding_posts: "Número de minutos que o utilizador deve esperar antes de poder editar uma mensagem oculta devido a sinalizações por parte da comunidade" max_topics_in_first_day: "O número máximo de tópicos que é o utilizador pode criar no seu primeiro dia no Fórum." max_replies_in_first_day: "Número máximo de mensagens que um utilizador pode criar no seu primeiro dia no Fórum." diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index 5c22281a6e6..e1065c534b1 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -24,7 +24,7 @@ pt_BR: loading: "Carregando" powered_by_html: 'Desenvolvido por Discourse, melhor visualizado com JavaScript ativado' log_in: "Entrar" - purge_reason: "A conta não verificada, foi excluída." + purge_reason: "Automaticamente eliminada por ser uma conta abandonada, não ativada" disable_remote_images_download_reason: "Download de imagens remotas foi desativado porque não havia espaço suficiente em disco disponível." anonymous: "Anônimo" emails: diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index d44a17e7149..98c03ce65af 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -340,7 +340,7 @@ ro: please_continue: "Noul dvs cont este confirmat, iar acum sunteți autentificat." continue_button: "Continuă cu %{site_name}" welcome_to: "Bine ați venit la %{site_name}!" - approval_required: "Un moderator trebuie să aprobe manual contul înaine să puteți accesa forumul. Veți primii un email când acesta a fost aprobat!" + approval_required: "Un moderator trebuie să aprobe manual contul înaine să puteți accesa forumul. Vei primi un email când acesta a fost aprobat!" post_action_types: off_topic: title: 'În afară discuției' @@ -352,7 +352,7 @@ ro: long_form: 'marchează aceasta ca spam' inappropriate: title: 'Necorespunzător' - description: 'Această postare are conținut pe care o persoană normală l-ar numii ofesator, abuziv, sau o violare a regulilor comune.' + description: 'Această postare are conținut ce ar putea fi considerat drept ofesator, abuziv, sau o violare a regulilor comune.' long_form: 'marcat ca necorespunzător' notify_user: email_title: 'Despre postarea dvs din "%{title}"' @@ -379,7 +379,7 @@ ro: long_form: 'Marchează asta ca spam' inappropriate: title: 'Necorespunzător' - description: 'Această discuție are conținut pe care o persoană normală l-ar numii ofesantor, abuziv, sau o violare a regulilor comune.' + description: 'Această discuție are conținut ce ar putea fi considerat drept ofesantor, abuziv, sau o violare a regulilor comune.' long_form: 'marcat ca necorespunzător' notify_moderators: title: "Notifică moderatori" @@ -601,7 +601,7 @@ ro: invite_expiry_days: "Cat timp sun valabile cheile de invitație ale utilizatorilor, în zile" invite_passthrough_hours: "Cât timp un utilizator poate folosii o cheie de invitație recuperată anterior pentru autentificare, în ore" invite_only: "Înregistrarea publică este dezactivată, toți utilizatorii noi trebuie să fie exclusiv invitați de un alt membru sau personalul site-ului." - login_required: "Autentificarea e necesară pentru a citii conținutul site-ului, nu permite accesul anonim." + login_required: "Autentificarea este necesară pentru a citi conținutul site-ului, nu permite accesul anonim." min_password_length: "Lungimea minimă de caractere pentru parolă." block_common_passwords: "nu permite parole ce sunt în cele 10,000 cele mai cunoscute parole." enable_local_logins: "Activează numele de utilizator local și a conturilor bazate pe logare cu parola. (Notă: Aceasta trebuie activiată pentru invitații pt a funcționa)" @@ -874,7 +874,7 @@ ro: previous_discussion: "Răspunsurile precedente" unsubscribe: title: "Dezabonare" - description: "Nu sunteți interesat în a primii aceste email-uri? Nicio problemă! Faceți clic dedesubt pentru a vă dezabona imediat:" + description: "Nu ești interesat în a primi aceste email-uri? Nicio problemă! Faceți click dedesubt pentru a vă dezabona imediat:" posted_by: "Postat de %{username} pe data %{post_date}" user_replied: subject_template: "[%{site_name}] %{topic_title}" diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index 606eb218287..213450abba0 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -12,7 +12,7 @@ ru: long_date: "D MMMM YYYY, HH:mm" datetime_formats: &datetime_formats formats: - short: "%m-%d-%Y" + short: "%d.%m.%Y" date: month_names: [null, Январь, Февраль, Март, Апрель, Май, Июнь, Июль, Август, Сентябрь, Октябрь, Ноябрь, Декабрь] <<: *datetime_formats @@ -22,7 +22,7 @@ ru: loading: "Загрузка..." powered_by_html: 'При поддержке Discourse, лучше всего использовать с включенным JavaScript' log_in: "Войти" - purge_reason: "Автоматически удален, как неактивная, неактивированная учетная запись" + purge_reason: "Деактивированная учетная запись будет автоматически удалена как заброшенная" disable_remote_images_download_reason: "Загрузка картинок была отключена из-за недостаточности места на диске." anonymous: "Гость" emails: diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index a9d2052a26f..00a51dab529 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -2436,18 +2436,14 @@ zh_CN: thank_you: name: 感谢你 description: 有 20 个被赞的帖子，给出过 10 个赞 - long_description: | - 该徽章授予给收到了 20 个赞，且赞过别人 10 次的你。当别人感谢你的帖子时，你也感谢他们的帖子。 gives_back: name: 回馈 description: 有 100 个被赞的帖子，给出过 100 个赞 - long_description: | - 该徽章授予给收到了 100 个赞，且赞过别人 100 次的你。感谢你回馈赞给社群！ empathetic: name: 感性 description: 有 500 个被赞的帖子，给出过 1000 个赞 - long_description: | - 该徽章授予给收到了 500 个赞，且赞过别人 1000 次的你。哇！你是一个富有同情心且会换位思考的模范。 :two_hearts: + first_emoji: + description: 在帖子中使用表情符号 admin_login: success: "邮件已发送" error: "错误！" diff --git a/plugins/poll/config/locales/client.bs_BA.yml b/plugins/poll/config/locales/client.bs_BA.yml index c03c38e5936..da40be0d95b 100644 --- a/plugins/poll/config/locales/client.bs_BA.yml +++ b/plugins/poll/config/locales/client.bs_BA.yml @@ -17,5 +17,8 @@ bs_BA: few: "ukupno glasova" other: "ukupno glasova" average_rating: "Prosječna ocjena: %{average}." + cast-votes: + title: "ukupno glasova" + label: "Glasaj" close: label: "Zatvori" diff --git a/plugins/poll/config/locales/client.fr.yml b/plugins/poll/config/locales/client.fr.yml index cb7bcccbd19..a674b4e69b2 100644 --- a/plugins/poll/config/locales/client.fr.yml +++ b/plugins/poll/config/locales/client.fr.yml @@ -9,8 +9,8 @@ fr: js: poll: voters: - one: "voteur" - other: "voteurs" + one: "votant" + other: "votants" total_votes: one: "vote au total" other: "votes au total" diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml index a3b3f1bbb41..b9be616a8b2 100644 --- a/plugins/poll/config/locales/client.ja.yml +++ b/plugins/poll/config/locales/client.ja.yml @@ -24,7 +24,7 @@ ja: between_min_and_max_options: "%{min} と %{max} のオプションから選択することができます。" cast-votes: title: "投票する" - label: "すぐ投票！" + label: "今すぐ投票！" show-results: title: "投票結果を表示" label: "結果を表示" diff --git a/plugins/poll/config/locales/server.ja.yml b/plugins/poll/config/locales/server.ja.yml index 7b42aca449f..16434983fa4 100644 --- a/plugins/poll/config/locales/server.ja.yml +++ b/plugins/poll/config/locales/server.ja.yml @@ -26,9 +26,9 @@ ja: cannot_change_polls_after_5_minutes: "最初の5分を経過すると、投票の追加、削除や名前変更はできません。" op_cannot_edit_options_after_5_minutes: "最初の5分を経過すると投票オプションの追加や削除はできません。投票オプションの編集が必要であれば、モデレータに連絡してください。" staff_cannot_add_or_remove_options_after_5_minutes: "最初の5分を経過すると投票オプションの追加や削除はできません。このトピックを閉じて新しいトピックを作成してください。" - no_polls_associated_with_this_post: "このポストに関連付けられた投票はありません。" - no_poll_with_this_name: "このポストに関連付けられた投票 %{name} はありません。" - post_is_deleted: "削除されたポストに作用することはできません。" + no_polls_associated_with_this_post: "この投稿に関連付けられた投票はありません。" + no_poll_with_this_name: "この投稿に関連付けられた投票 %{name} はありません。" + post_is_deleted: "削除された投稿を操作する事はできません。" topic_must_be_open_to_vote: "投票するトピックはオープンになっている必要があります。" poll_must_be_open_to_vote: "投票するにはオープンになっている必要があります。" topic_must_be_open_to_toggle_status: "状態を切り替えるには、トピックがオープンになっている必要があります。" diff --git a/public/500.ja.html b/public/500.ja.html index 9e698a3fec6..48faa075b9e 100644 --- a/public/500.ja.html +++ b/public/500.ja.html @@ -5,7 +5,7 @@

500

-

このディスカッションフォーラムに予期しないエラーが発生しました。

+

予期しないエラーが発生しました。

エラーについての詳細情報は記録されました。自動通知を受け取りました。確認致します。

これ以上のアクションは必要ありません。ただし、エラーが解消されない場合、エラー再現の手順を含めて,このカテゴリ.に投稿することにより詳細情報を提供することができます。

From 113ce00e6a36f83575da60173ece6af7b20ad0ba Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 26 May 2016 11:51:48 -0400 Subject: [PATCH 010/320] Version bump to v1.6.0.beta6 --- lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.rb b/lib/version.rb index 146324f3b49..919b48142d1 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 6 TINY = 0 - PRE = 'beta5' + PRE = 'beta6' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end From 51dbb966de66fea4409f0b750f24fb337054d6bf Mon Sep 17 00:00:00 2001 From: James Kiesel Date: Thu, 26 May 2016 09:33:49 -0700 Subject: [PATCH 011/320] Don't display activity summary in two places (#4239) * Don't display activity summary in two places * Re-add tl0 user digest option --- .../discourse/templates/user/preferences.hbs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs index 9c14f6b4570..cb9b9e6c1f7 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs @@ -168,16 +168,6 @@
- {{#if canReceiveDigest}} - {{preference-checkbox labelKey="user.email_digests.title" checked=model.user_option.email_digests}} - {{#if model.user_option.email_digests}} -
- {{combo-box valueAttribute="value" content=digestFrequencies value=model.user_option.digest_after_minutes}} -
- {{preference-checkbox labelKey="user.include_tl0_in_digests" checked=model.user_option.include_tl0_in_digests}} - {{/if}} - {{/if}} -
{{combo-box valueAttribute="value" content=previousRepliesOptions value=model.user_option.email_previous_replies}} @@ -205,6 +195,7 @@
{{combo-box valueAttribute="value" content=digestFrequencies value=model.user_option.digest_after_minutes}}
+ {{preference-checkbox labelKey="user.include_tl0_in_digests" disabled=model.user_option.mailing_list_mode checked=model.user_option.include_tl0_in_digests}} {{/if}} {{/if}}
From ebd4b4577168644ff1132af85215bfa2034ecdbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 26 May 2016 19:02:31 +0200 Subject: [PATCH 012/320] FIX: use 16:9 ratio to detect whether to crop a thumbnail or not --- lib/cooked_post_processor.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index 60af2b57acf..9d9e1fac38d 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -186,6 +186,10 @@ class CookedPostProcessor rescue URI::InvalidURIError end + # only crop when the image is taller than 16:9 + # we only use 95% of that to allow for a small margin + MIN_RATIO_TO_CROP ||= (9.0 / 16.0) * 0.95 + def convert_to_link!(img) src = img["src"] return unless src.present? @@ -208,7 +212,7 @@ class CookedPostProcessor return if is_a_hyperlink?(img) crop = false - if original_width.to_f / original_height.to_f < 0.75 + if original_width.to_f / original_height.to_f < MIN_RATIO_TO_CROP crop = true width, height = ImageSizer.crop(original_width, original_height) img["width"] = width From 2e1cc061d8338b3c94a675a3bc9b0e3841a4b7ba Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Sun, 24 Apr 2016 16:31:41 +0200 Subject: [PATCH 013/320] Make sure PMs imported from phpBB3 are only visible to the correct users In addition this tries to automatically fix PMs that were migrated from phpBB2 to phpBB3. --- .../phpbb3/database/database_3_0.rb | 183 +++--------------- script/import_scripts/phpbb3/importer.rb | 9 +- .../phpbb3/importers/message_importer.rb | 100 +++++++--- script/import_scripts/phpbb3/settings.yml | 6 - .../import_scripts/phpbb3/support/settings.rb | 2 - 5 files changed, 105 insertions(+), 195 deletions(-) diff --git a/script/import_scripts/phpbb3/database/database_3_0.rb b/script/import_scripts/phpbb3/database/database_3_0.rb index f6ebc9223e4..94ec4ca50f0 100644 --- a/script/import_scripts/phpbb3/database/database_3_0.rb +++ b/script/import_scripts/phpbb3/database/database_3_0.rb @@ -161,82 +161,39 @@ module ImportScripts::PhpBB3 SQL end - def count_messages(use_fixed_messages) - if use_fixed_messages - count(<<-SQL) - SELECT COUNT(*) AS count - FROM #{@table_prefix}_import_privmsgs - SQL - else - count(<<-SQL) - SELECT COUNT(*) AS count - FROM #{@table_prefix}_privmsgs - SQL - end + def count_messages + count(<<-SQL) + SELECT COUNT(*) AS count + FROM #{@table_prefix}_privmsgs m + WHERE NOT EXISTS ( -- ignore duplicate messages + SELECT 1 + FROM #{@table_prefix}_privmsgs x + WHERE x.msg_id < m.msg_id AND x.root_level = m.root_level AND x.author_id = m.author_id + AND x.to_address = m.to_address AND x.message_time = m.message_time + ) + SQL end - def fetch_messages(use_fixed_messages, last_msg_id) - if use_fixed_messages - query(<<-SQL, :msg_id) - SELECT m.msg_id, i.root_msg_id, m.author_id, m.message_time, m.message_subject, m.message_text, - IFNULL(a.attachment_count, 0) AS attachment_count - FROM #{@table_prefix}_privmsgs m - JOIN #{@table_prefix}_import_privmsgs i ON (m.msg_id = i.msg_id) - LEFT OUTER JOIN ( - SELECT post_msg_id, COUNT(*) AS attachment_count - FROM #{@table_prefix}_attachments - WHERE topic_id = 0 - GROUP BY post_msg_id - ) a ON (m.msg_id = a.post_msg_id) - WHERE m.msg_id > #{last_msg_id} - ORDER BY i.root_msg_id, m.msg_id - LIMIT #{@batch_size} - SQL - else - query(<<-SQL, :msg_id) - SELECT m.msg_id, m.root_level AS root_msg_id, m.author_id, m.message_time, m.message_subject, - m.message_text, IFNULL(a.attachment_count, 0) AS attachment_count - FROM #{@table_prefix}_privmsgs m - LEFT OUTER JOIN ( - SELECT post_msg_id, COUNT(*) AS attachment_count - FROM #{@table_prefix}_attachments - WHERE topic_id = 0 - GROUP BY post_msg_id - ) a ON (m.msg_id = a.post_msg_id) - WHERE m.msg_id > #{last_msg_id} - ORDER BY m.root_level, m.msg_id - LIMIT #{@batch_size} - SQL - end - end - - def fetch_message_participants(msg_id, use_fixed_messages) - if use_fixed_messages - query(<<-SQL) - SELECT m.to_address - FROM #{@table_prefix}_privmsgs m - JOIN #{@table_prefix}_import_privmsgs i ON (m.msg_id = i.msg_id) - WHERE i.msg_id = #{msg_id} OR i.root_msg_id = #{msg_id} - SQL - else - query(<<-SQL) - SELECT m.to_address - FROM #{@table_prefix}_privmsgs m - WHERE m.msg_id = #{msg_id} OR m.root_level = #{msg_id} - SQL - end - end - - def calculate_fixed_messages - drop_temp_import_message_table - create_temp_import_message_table - fill_temp_import_message_table - - drop_import_message_table - create_import_message_table - fill_import_message_table - - drop_temp_import_message_table + def fetch_messages(last_msg_id) + query(<<-SQL, :msg_id) + SELECT m.msg_id, m.root_level AS root_msg_id, m.author_id, m.message_time, m.message_subject, + m.message_text, m.to_address, r.author_id AS root_author_id, r.to_address AS root_to_address, ( + SELECT COUNT(*) + FROM #{@table_prefix}_attachments a + WHERE a.topic_id = 0 AND m.msg_id = a.post_msg_id + ) AS attachment_count + FROM #{@table_prefix}_privmsgs m + LEFT OUTER JOIN #{@table_prefix}_privmsgs r ON (m.root_level = r.msg_id) + WHERE m.msg_id > #{last_msg_id} + AND NOT EXISTS ( -- ignore duplicate messages + SELECT 1 + FROM #{@table_prefix}_privmsgs x + WHERE x.msg_id < m.msg_id AND x.root_level = m.root_level AND x.author_id = m.author_id + AND x.to_address = m.to_address AND x.message_time = m.message_time + ) + ORDER BY m.msg_id + LIMIT #{@batch_size} + SQL end def count_bookmarks @@ -268,83 +225,5 @@ module ImportScripts::PhpBB3 (SELECT config_value FROM #{@table_prefix}_config WHERE config_name = 'upload_path') AS attachment_path SQL end - - protected - - def drop_temp_import_message_table - query("DROP TABLE IF EXISTS #{@table_prefix}_import_privmsgs_temp") - end - - def create_temp_import_message_table - query(<<-SQL) - CREATE TABLE #{@table_prefix}_import_privmsgs_temp ( - msg_id MEDIUMINT(8) NOT NULL, - root_msg_id MEDIUMINT(8) NOT NULL, - recipient_id MEDIUMINT(8), - normalized_subject VARCHAR(255) NOT NULL, - PRIMARY KEY (msg_id) - ) - SQL - end - - # this removes duplicate messages, converts the to_address to a number - # and stores the message_subject in lowercase and without the prefix "Re: " - def fill_temp_import_message_table - query(<<-SQL) - INSERT INTO #{@table_prefix}_import_privmsgs_temp (msg_id, root_msg_id, recipient_id, normalized_subject) - SELECT m.msg_id, m.root_level, - CASE WHEN m.root_level = 0 AND INSTR(m.to_address, ':') = 0 THEN - CAST(SUBSTRING(m.to_address, 3) AS SIGNED INTEGER) - ELSE NULL END AS recipient_id, - LOWER(CASE WHEN m.message_subject LIKE 'Re: %' THEN - SUBSTRING(m.message_subject, 5) - ELSE m.message_subject END) AS normalized_subject - FROM #{@table_prefix}_privmsgs m - WHERE NOT EXISTS ( - SELECT 1 - FROM #{@table_prefix}_privmsgs x - WHERE x.msg_id < m.msg_id AND x.root_level = m.root_level AND x.author_id = m.author_id - AND x.to_address = m.to_address AND x.message_time = m.message_time - ) - SQL - end - - def drop_import_message_table - query("DROP TABLE IF EXISTS #{@table_prefix}_import_privmsgs") - end - - def create_import_message_table - query(<<-SQL) - CREATE TABLE #{@table_prefix}_import_privmsgs ( - msg_id MEDIUMINT(8) NOT NULL, - root_msg_id MEDIUMINT(8) NOT NULL, - PRIMARY KEY (msg_id), - INDEX #{@table_prefix}_import_privmsgs_root_msg_id (root_msg_id) - ) - SQL - end - - # this tries to calculate the actual root_level (= msg_id of the first message in a - # private conversation) based on subject, time, author and recipient - def fill_import_message_table - query(<<-SQL) - INSERT INTO #{@table_prefix}_import_privmsgs (msg_id, root_msg_id) - SELECT m.msg_id, CASE WHEN i.root_msg_id = 0 THEN - COALESCE(( - SELECT a.msg_id - FROM #{@table_prefix}_privmsgs a - JOIN #{@table_prefix}_import_privmsgs_temp b ON (a.msg_id = b.msg_id) - WHERE ((a.author_id = m.author_id AND b.recipient_id = i.recipient_id) OR - (a.author_id = i.recipient_id AND b.recipient_id = m.author_id)) - AND b.normalized_subject = i.normalized_subject - AND a.msg_id <> m.msg_id - AND a.message_time < m.message_time - ORDER BY a.message_time - LIMIT 1 - ), 0) ELSE i.root_msg_id END AS root_msg_id - FROM #{@table_prefix}_privmsgs m - JOIN #{@table_prefix}_import_privmsgs_temp i ON (m.msg_id = i.msg_id) - SQL - end end end diff --git a/script/import_scripts/phpbb3/importer.rb b/script/import_scripts/phpbb3/importer.rb index b0c46c870ae..b9daaa15687 100644 --- a/script/import_scripts/phpbb3/importer.rb +++ b/script/import_scripts/phpbb3/importer.rb @@ -118,18 +118,13 @@ module ImportScripts::PhpBB3 end def import_private_messages - if @settings.fix_private_messages - puts '', 'fixing private messages' - @database.calculate_fixed_messages - end - puts '', 'creating private messages' - total_count = @database.count_messages(@settings.fix_private_messages) + total_count = @database.count_messages importer = @importers.message_importer last_msg_id = 0 batches do |offset| - rows, last_msg_id = @database.fetch_messages(@settings.fix_private_messages, last_msg_id) + rows, last_msg_id = @database.fetch_messages(last_msg_id) break if rows.size < 1 next if all_records_exist?(:posts, importer.map_to_import_ids(rows)) diff --git a/script/import_scripts/phpbb3/importers/message_importer.rb b/script/import_scripts/phpbb3/importers/message_importer.rb index 0ebab7d242a..c164806b657 100644 --- a/script/import_scripts/phpbb3/importers/message_importer.rb +++ b/script/import_scripts/phpbb3/importers/message_importer.rb @@ -14,7 +14,7 @@ module ImportScripts::PhpBB3 end def map_to_import_ids(rows) - rows.map { |row| get_import_id(row) } + rows.map { |row| get_import_id(row[:msg_id]) } end @@ -23,31 +23,38 @@ module ImportScripts::PhpBB3 attachments = import_attachments(row, user_id) mapped = { - id: get_import_id(row), + id: get_import_id(row[:msg_id]), user_id: user_id, created_at: Time.zone.at(row[:message_time]), raw: @text_processor.process_private_msg(row[:message_text], attachments) } - if row[:root_msg_id] == 0 - map_first_message(row, mapped) + root_user_ids = sorted_user_ids(row[:root_author_id], row[:root_to_address]) + current_user_ids = sorted_user_ids(row[:author_id], row[:to_address]) + topic_id = get_topic_id(row, root_user_ids, current_user_ids) + + if topic_id.blank? + map_first_message(row, current_user_ids, mapped) else - map_other_message(row, mapped) + map_other_message(row, topic_id, mapped) end end protected + RE_PREFIX = 're: ' + def import_attachments(row, user_id) if @settings.import_attachments && row[:attachment_count] > 0 @attachment_importer.import_attachments(user_id, row[:msg_id]) end end - def map_first_message(row, mapped) - mapped[:title] = CGI.unescapeHTML(row[:message_subject]) + def map_first_message(row, current_user_ids, mapped) + mapped[:title] = get_topic_title(row) mapped[:archetype] = Archetype.private_message - mapped[:target_usernames] = get_usernames(row[:msg_id], row[:author_id]) + mapped[:target_usernames] = get_recipient_usernames(row) + mapped[:custom_fields] = {import_user_ids: current_user_ids.join(',')} if mapped[:target_usernames].empty? # pm with yourself? puts "Private message without recipients. Skipping #{row[:msg_id]}: #{row[:message_subject][0..40]}" @@ -57,36 +64,73 @@ module ImportScripts::PhpBB3 mapped end - def map_other_message(row, mapped) - parent_msg_id = "pm:#{row[:root_msg_id]}" - parent = @lookup.topic_lookup_from_imported_post_id(parent_msg_id) - - if parent.blank? - puts "Parent post #{parent_msg_id} doesn't exist. Skipping #{row[:msg_id]}: #{row[:message_subject][0..40]}" - return nil - end - - mapped[:topic_id] = parent[:topic_id] + def map_other_message(row, topic_id, mapped) + mapped[:topic_id] = topic_id mapped end - def get_usernames(msg_id, author_id) - # Find the users who are part of this private message. - # Found from the to_address of phpbb_privmsgs, by looking at - # all the rows with the same root_msg_id. + def get_recipient_user_ids(to_address) + return [] if to_address.blank? + # to_address looks like this: "u_91:u_1234:u_200" # The "u_" prefix is discarded and the rest is a user_id. - import_user_ids = @database.fetch_message_participants(msg_id, @settings.fix_private_messages) - .map { |r| r[:to_address].split(':') } - .flatten!.uniq.map! { |u| u[2..-1] } + user_ids = to_address.split(':') + user_ids.uniq! + user_ids.map! { |u| u[2..-1].to_i } + end + + def get_recipient_usernames(row) + author_id = row[:author_id].to_s + import_user_ids = get_recipient_user_ids(row[:to_address]) import_user_ids.map! do |import_user_id| - import_user_id.to_s == author_id.to_s ? nil : @lookup.find_user_by_import_id(import_user_id).try(:username) + import_user_id.to_s == author_id ? nil : @lookup.find_user_by_import_id(import_user_id).try(:username) end.compact end - def get_import_id(row) - "pm:#{row[:msg_id]}" + def get_topic_title(row) + CGI.unescapeHTML(row[:message_subject]) + end + + def get_import_id(msg_id) + "pm:#{msg_id}" + end + + # Creates a sorted array consisting of the message's author and recipients. + def sorted_user_ids(author_id, to_address) + user_ids = get_recipient_user_ids(to_address) + user_ids << author_id unless author_id.nil? + user_ids.uniq! + user_ids.sort! + end + + def get_topic_id(row, root_user_ids, current_user_ids) + if row[:root_msg_id] == 0 || root_user_ids != current_user_ids + # Let's try to find an existing Discourse topic_id if this looks like a root message or + # the user IDs of the root message are different from the current message. + find_topic_id(row, current_user_ids) + else + # This appears to be a reply. Let's try to find the Discourse topic_id for this message. + parent_msg_id = get_import_id(row[:root_msg_id]) + parent = @lookup.topic_lookup_from_imported_post_id(parent_msg_id) + parent[:topic_id] unless parent.blank? + end + end + + # Tries to find a Discourse topic (private message) that has the same title as the current message. + # The users involved in these messages must match too. + def find_topic_id(row, current_user_ids) + topic_title = get_topic_title(row).downcase + topic_titles = [topic_title] + topic_titles << topic_title[RE_PREFIX.length..-1] if topic_title.start_with?(RE_PREFIX) + + Post.select(:topic_id) + .joins(:topic) + .joins(:_custom_fields) + .where(["LOWER(topics.title) IN (:titles) AND post_custom_fields.name = 'import_user_ids' AND post_custom_fields.value = :user_ids", + {titles: topic_titles, user_ids: current_user_ids.join(',')}]) + .order('topics.created_at DESC') + .first.try(:topic_id) end end end diff --git a/script/import_scripts/phpbb3/settings.yml b/script/import_scripts/phpbb3/settings.yml index 5164270c910..8377860e8d0 100644 --- a/script/import_scripts/phpbb3/settings.yml +++ b/script/import_scripts/phpbb3/settings.yml @@ -52,12 +52,6 @@ import: private_messages: true polls: true - # This tries to fix Private Messages that were imported from phpBB2 to phpBB3. - # You should enable this option if you see duplicate messages or lots of related - # messages as topics with just one post (e.g. 'Importer', 'Re: Importer', 'Re: Importer' - # should be one topic named 'Importer' and consist of 3 posts). - fix_private_messages: false - # When true: each imported user will have the original username from phpBB as its name # When false: the name of each user will be blank username_as_name: false diff --git a/script/import_scripts/phpbb3/support/settings.rb b/script/import_scripts/phpbb3/support/settings.rb index f7ff71ce9f3..870c162b762 100644 --- a/script/import_scripts/phpbb3/support/settings.rb +++ b/script/import_scripts/phpbb3/support/settings.rb @@ -18,7 +18,6 @@ module ImportScripts::PhpBB3 attr_reader :import_remote_avatars attr_reader :import_gallery_avatars - attr_reader :fix_private_messages attr_reader :use_bbcode_to_md attr_reader :original_site_prefix @@ -45,7 +44,6 @@ module ImportScripts::PhpBB3 @import_remote_avatars = avatar_settings['remote'] @import_gallery_avatars = avatar_settings['gallery'] - @fix_private_messages = import_settings['fix_private_messages'] @use_bbcode_to_md =import_settings['use_bbcode_to_md'] @original_site_prefix = import_settings['site_prefix']['original'] From f13470b96bcae5a3fd1dd4baa943cc730a922f31 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 4 May 2016 14:02:47 -0400 Subject: [PATCH 014/320] Use db schema for tags instead of plugin store and custom fields --- .../discourse/controllers/rename-tag.js.es6 | 13 +- app/controllers/tags_controller.rb | 65 +++++---- app/helpers/topics_helper.rb | 5 +- app/jobs/onceoff/migrate_tagging_plugin.rb | 16 +++ app/models/tag.rb | 18 +++ app/models/tag_user.rb | 95 +++++++++++++ app/models/topic.rb | 8 +- app/models/topic_tag.rb | 4 + app/models/topic_user.rb | 5 +- app/models/user.rb | 1 + app/serializers/post_revision_serializer.rb | 9 ++ app/serializers/site_serializer.rb | 2 +- app/serializers/topic_list_item_serializer.rb | 2 +- app/serializers/topic_list_serializer.rb | 2 +- app/serializers/topic_view_serializer.rb | 13 +- db/migrate/20160503205953_create_tags.rb | 27 ++++ lib/discourse_tagging.rb | 114 +++++++--------- lib/post_creator.rb | 12 -- lib/post_revisor.rb | 50 +------ lib/pretty_text.rb | 4 +- lib/search.rb | 8 +- lib/topic_creator.rb | 9 ++ lib/topic_query.rb | 15 +++ lib/topics_bulk_action.rb | 7 +- spec/components/post_creator_spec.rb | 53 ++++++++ spec/components/post_revisor_spec.rb | 126 ++++++++++++++++++ spec/components/pretty_text_spec.rb | 6 +- spec/components/search_spec.rb | 10 ++ spec/components/topic_query_spec.rb | 39 ++++++ spec/components/topics_bulk_action_spec.rb | 52 ++++++++ spec/fabricators/tag_fabricator.rb | 3 + spec/models/tag_spec.rb | 32 +++++ spec/models/tag_user_spec.rb | 87 ++++++++++++ 33 files changed, 726 insertions(+), 186 deletions(-) create mode 100644 app/jobs/onceoff/migrate_tagging_plugin.rb create mode 100644 app/models/tag.rb create mode 100644 app/models/tag_user.rb create mode 100644 app/models/topic_tag.rb create mode 100644 db/migrate/20160503205953_create_tags.rb create mode 100644 spec/fabricators/tag_fabricator.rb create mode 100644 spec/models/tag_spec.rb create mode 100644 spec/models/tag_user_spec.rb diff --git a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 index 3c5a7bc2921..0585d4a6cc1 100644 --- a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 +++ b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 @@ -1,5 +1,6 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; import BufferedContent from 'discourse/mixins/buffered-content'; +import { extractError } from 'discourse/lib/ajax-error'; export default Ember.Controller.extend(ModalFunctionality, BufferedContent, { @@ -14,11 +15,15 @@ export default Ember.Controller.extend(ModalFunctionality, BufferedContent, { performRename() { const tag = this.get('model'), self = this; - tag.update({ id: this.get('buffered.id') }).then(function() { + tag.update({ id: this.get('buffered.id') }).then(function(result) { self.send('closeModal'); - self.transitionToRoute('tags.show', tag.get('id')); - }).catch(function() { - self.flash(I18n.t('generic_error'), 'error'); + if (result.responseJson.tag) { + self.transitionToRoute('tags.show', result.responseJson.tag.id); + } else { + self.flash(extractError(result.responseJson.errors[0]), 'error'); + } + }).catch(function(error) { + self.flash(extractError(error), 'error'); }); } } diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 6b08a54f3b0..23eac88860a 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -29,14 +29,11 @@ class TagsController < ::ApplicationController define_method("show_#{filter}") do @tag_id = DiscourseTagging.clean_tag(params[:tag_id]) - # TODO PERF: doesn't scale: - topics_tagged = TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: @tag_id).pluck(:topic_id) - page = params[:page].to_i query = TopicQuery.new(current_user, build_topic_list_options) - results = query.send("#{filter}_results").where(id: topics_tagged) + results = query.send("#{filter}_results") if @filter_on_category category_ids = [@filter_on_category.id] + @filter_on_category.subcategories.pluck(:id) @@ -52,8 +49,7 @@ class TagsController < ::ApplicationController @list.more_topics_url = list_by_tag_path(tag_id: @tag_id, page: page + 1) @rss = "tag" - - if @list.topics.size == 0 && !TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: @tag_id).exists? + if @list.topics.size == 0 && !Tag.where(name: @tag_id).exists? raise Discourse::NotFound else respond_with_list(@list) @@ -68,20 +64,25 @@ class TagsController < ::ApplicationController def update guardian.ensure_can_admin_tags! - new_tag_id = DiscourseTagging.clean_tag(params[:tag][:id]) - if current_user.staff? - DiscourseTagging.rename_tag(current_user, params[:tag_id], new_tag_id) + tag = Tag.find_by_name(params[:tag_id]) + raise Discourse::NotFound if tag.nil? + + new_tag_name = DiscourseTagging.clean_tag(params[:tag][:id]) + tag.name = new_tag_name + if tag.save + StaffActionLogger.new(current_user).log_custom('renamed_tag', previous_value: params[:tag_id], new_value: new_tag_name) + render json: { tag: { id: new_tag_name }} + else + render_json_error tag.errors.full_messages end - render json: { tag: { id: new_tag_id }} end def destroy guardian.ensure_can_admin_tags! - tag_id = params[:tag_id] + tag_name = params[:tag_id] TopicCustomField.transaction do - TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: tag_id).delete_all - UserCustomField.delete_all(name: ::DiscourseTagging.notification_key(tag_id)) - StaffActionLogger.new(current_user).log_custom('deleted_tag', subject: tag_id) + Tag.find_by_name(tag_name).destroy + StaffActionLogger.new(current_user).log_custom('deleted_tag', subject: tag_name) end render json: success_json end @@ -89,45 +90,45 @@ class TagsController < ::ApplicationController def tag_feed discourse_expires_in 1.minute - tag_id = ::DiscourseTagging.clean_tag(params[:tag_id]) + tag_id = DiscourseTagging.clean_tag(params[:tag_id]) @link = "#{Discourse.base_url}/tags/#{tag_id}" @description = I18n.t("rss_by_tag", tag: tag_id) @title = "#{SiteSetting.title} - #{@description}" @atom_link = "#{Discourse.base_url}/tags/#{tag_id}.rss" - query = TopicQuery.new(current_user) - topics_tagged = TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: tag_id).pluck(:topic_id) - latest_results = query.latest_results.where(id: topics_tagged) + query = TopicQuery.new(current_user, {tags: [tag_id]}) + latest_results = query.latest_results @topic_list = query.create_list(:by_tag, {}, latest_results) render 'list/list', formats: [:rss] end def search - tags = self.class.tags_by_count(guardian, params.slice(:limit)) + query = self.class.tags_by_count(guardian, params.slice(:limit)) term = params[:q] if term.present? term.gsub!(/[^a-z0-9\.\-\_]*/, '') term.gsub!("_", "\\_") - tags = tags.where('value like ?', "%#{term}%") + query = query.where('tags.name like ?', "%#{term}%") end - tags = tags.count(:value).map {|t, c| { id: t, text: t, count: c } } + tags = query.count.map {|t, c| { id: t, text: t, count: c } } render json: { results: tags } end def notifications - level = current_user.custom_fields[::DiscourseTagging.notification_key(params[:tag_id])] || 1 + tag = Tag.find_by_name(params[:tag_id]) + raise Discourse::NotFound unless tag + level = tag.tag_users.where(user: current_user).first.try(:notification_level) || TagUser.notification_levels[:regular] render json: { tag_notification: { id: params[:tag_id], notification_level: level.to_i } } end def update_notifications + tag = Tag.find_by_name(params[:tag_id]) + raise Discourse::NotFound unless tag level = params[:tag_notification][:notification_level].to_i - - current_user.custom_fields[::DiscourseTagging.notification_key(params[:tag_id])] = level - current_user.save_custom_fields - + TagUser.change(current_user.id, tag.id, level) render json: {notification_level: level} end @@ -147,15 +148,8 @@ class TagsController < ::ApplicationController raise Discourse::NotFound unless SiteSetting.tagging_enabled? end - def self.tags_by_count(guardian, opts=nil) - opts = opts || {} - result = TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME) - .joins(:topic) - .group(:value) - .limit(opts[:limit] || 5) - .order('COUNT(topic_custom_fields.value) DESC') - - guardian.filter_allowed_categories(result) + def self.tags_by_count(guardian, opts={}) + guardian.filter_allowed_categories(Tag.tags_by_count_query(opts)) end def set_category_from_params @@ -182,6 +176,7 @@ class TagsController < ::ApplicationController topic_ids: param_to_integer_list(:topic_ids), exclude_category_ids: params[:exclude_category_ids], category: params[:category], + tags: [params[:tag_id]], order: params[:order], ascending: params[:ascending], min_posts: params[:min_posts], diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb index a92617e80f6..857e1fc9005 100644 --- a/app/helpers/topics_helper.rb +++ b/app/helpers/topics_helper.rb @@ -17,9 +17,8 @@ module TopicsHelper if (tags = topic.tags).present? tags.each do |tag| - tag_id = DiscourseTagging.clean_tag(tag) - url = "#{Discourse.base_url}/tags/#{tag_id}" - breadcrumb << {url: url, name: tag} + url = "#{Discourse.base_url}/tags/#{tag.name}" + breadcrumb << {url: url, name: tag.name} end end diff --git a/app/jobs/onceoff/migrate_tagging_plugin.rb b/app/jobs/onceoff/migrate_tagging_plugin.rb new file mode 100644 index 00000000000..f0bb91e7e49 --- /dev/null +++ b/app/jobs/onceoff/migrate_tagging_plugin.rb @@ -0,0 +1,16 @@ +module Jobs + + class MigrateTaggingPlugin < Jobs::Onceoff + + def execute_onceoff(args) + all_tags = TopicCustomField.where(name: "tags").select('DISTINCT value').all.map(&:value) + tag_id_lookup = Tag.create(all_tags.map { |tag_name| {name: tag_name} }).inject({}) { |h,v| h[v.name] = v.id; h } + + TopicCustomField.where(name: "tags").find_each do |tcf| + TopicTag.create(topic_id: tcf.topic_id, tag_id: tag_id_lookup[tcf.value] || Tag.find_by_name(tcf.value).try(:id)) + end + end + + end + +end diff --git a/app/models/tag.rb b/app/models/tag.rb new file mode 100644 index 00000000000..bb628d38f9e --- /dev/null +++ b/app/models/tag.rb @@ -0,0 +1,18 @@ +class Tag < ActiveRecord::Base + validates :name, presence: true, uniqueness: true + has_many :topic_tags, dependent: :destroy + has_many :topics, through: :topic_tags + has_many :tag_users + + def self.tags_by_count_query(opts={}) + q = TopicTag.joins(:tag, :topic).group("topic_tags.tag_id, tags.name").order('count_all DESC') + q = q.limit(opts[:limit]) if opts[:limit] + q + end + + def self.top_tags(limit_arg=nil) + self.tags_by_count_query(limit: limit_arg || SiteSetting.max_tags_in_filter_list) + .count + .map {|name, count| name} + end +end diff --git a/app/models/tag_user.rb b/app/models/tag_user.rb new file mode 100644 index 00000000000..1abd68ea0ec --- /dev/null +++ b/app/models/tag_user.rb @@ -0,0 +1,95 @@ +class TagUser < ActiveRecord::Base + belongs_to :tag + belongs_to :user + + def self.notification_levels + TopicUser.notification_levels + end + + def self.change(user_id, tag_id, level) + tag_id = tag_id.id if tag_id.is_a?(::Tag) + user_id = user_id.id if user_id.is_a?(::User) + + tag_id = tag_id.to_i + user_id = user_id.to_i + + tag_user = TagUser.where(user_id: user_id, tag_id: tag_id).first + + if tag_user + return tag_user if tag_user.notification_level == level + tag_user.notification_level = level + tag_user.save + else + tag_user = TagUser.create(user_id: user_id, tag_id: tag_id, notification_level: level) + end + + tag_user + rescue ActiveRecord::RecordNotUnique + # In case of a race condition to insert, do nothing + end + + %w{watch track}.each do |s| + define_singleton_method("auto_#{s}_new_topic") do |topic, new_tags=nil| + tag_ids = topic.tags.pluck(:id) + if !new_tags.nil? && topic.created_at && topic.created_at > 5.days.ago + tag_ids = new_tags.map(&:id) + remove_default_from_topic( topic.id, tag_ids, + TopicUser.notification_levels[:"#{s}ing"], + TopicUser.notification_reasons[:"auto_#{s}_tag"] ) + end + + apply_default_to_topic( topic.id, tag_ids, + TopicUser.notification_levels[:"#{s}ing"], + TopicUser.notification_reasons[:"auto_#{s}_tag"]) + end + end + + def self.apply_default_to_topic(topic_id, tag_ids, level, reason) + sql = <<-SQL + INSERT INTO topic_users(user_id, topic_id, notification_level, notifications_reason_id) + SELECT user_id, :topic_id, :level, :reason + FROM tag_users + WHERE notification_level = :level + AND tag_id in (:tag_ids) + AND NOT EXISTS(SELECT 1 FROM topic_users WHERE topic_id = :topic_id AND user_id = tag_users.user_id) + LIMIT 1 + SQL + + exec_sql(sql, + topic_id: topic_id, + tag_ids: tag_ids, + level: level, + reason: reason + ) + end + + def self.remove_default_from_topic(topic_id, tag_ids, level, reason) + sql = <<-SQL + DELETE FROM topic_users + WHERE topic_id = :topic_id + AND notifications_changed_at IS NULL + AND notification_level = :level + AND notifications_reason_id = :reason + SQL + + if !tag_ids.empty? + sql << <<-SQL + AND NOT EXISTS( + SELECT 1 + FROM tag_users + WHERE tag_users.tag_id in (:tag_ids) + AND tag_users.notification_level = :level + AND tag_users.user_id = topic_users.user_id) + SQL + end + + exec_sql(sql, + topic_id: topic_id, + level: level, + reason: reason, + tag_ids: tag_ids + ) + end + + private_class_method :apply_default_to_topic, :remove_default_from_topic +end diff --git a/app/models/topic.rb b/app/models/topic.rb index 2fc44840516..5694d3c0c0e 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -92,6 +92,9 @@ class Topic < ActiveRecord::Base has_many :allowed_users, through: :topic_allowed_users, source: :user has_many :queued_posts + has_many :topic_tags, dependent: :destroy + has_many :tags, through: :topic_tags + has_one :top_topic belongs_to :user belongs_to :last_poster, class_name: 'User', foreign_key: :last_post_user_id @@ -1042,11 +1045,6 @@ SQL builder.exec.first["count"].to_i end - def tags - result = custom_fields[DiscourseTagging::TAGS_FIELD_NAME] - [result].flatten unless result.blank? - end - def convert_to_public_topic(user) public_topic = TopicConverter.new(self, user).convert_to_public_topic add_small_action(user, "public_topic") if public_topic diff --git a/app/models/topic_tag.rb b/app/models/topic_tag.rb new file mode 100644 index 00000000000..9882ddf2450 --- /dev/null +++ b/app/models/topic_tag.rb @@ -0,0 +1,4 @@ +class TopicTag < ActiveRecord::Base + belongs_to :topic + belongs_to :tag, counter_cache: "topic_count" +end diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb index 5d0919de823..78480319c07 100644 --- a/app/models/topic_user.rb +++ b/app/models/topic_user.rb @@ -32,7 +32,10 @@ class TopicUser < ActiveRecord::Base auto_watch_category: 6, auto_mute_category: 7, auto_track_category: 8, - plugin_changed: 9) + plugin_changed: 9, + auto_watch_tag: 10, + auto_mute_tag: 11, + auto_track_tag: 12) end def auto_track(user_id, topic_id, reason) diff --git a/app/models/user.rb b/app/models/user.rb index a410a71161b..4b20b97187d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,6 +18,7 @@ class User < ActiveRecord::Base has_many :notifications, dependent: :destroy has_many :topic_users, dependent: :destroy has_many :category_users, dependent: :destroy + has_many :tag_users, dependent: :destroy has_many :topics has_many :user_open_ids, dependent: :destroy has_many :user_actions, dependent: :destroy diff --git a/app/serializers/post_revision_serializer.rb b/app/serializers/post_revision_serializer.rb index 383d4142e98..d1c93541150 100644 --- a/app/serializers/post_revision_serializer.rb +++ b/app/serializers/post_revision_serializer.rb @@ -41,6 +41,7 @@ class PostRevisionSerializer < ApplicationSerializer end add_compared_field :wiki + add_compared_field :tags def previous_hidden previous["hidden"] @@ -149,6 +150,10 @@ class PostRevisionSerializer < ApplicationSerializer } end + def include_tags_changes? + SiteSetting.tagging_enabled + end + protected def post @@ -184,6 +189,10 @@ class PostRevisionSerializer < ApplicationSerializer end end + if SiteSetting.tagging_enabled + latest_modifications["tags"] = post.topic.tags.map(&:name) + end + post_revisions << PostRevision.new( number: post_revisions.last.number + 1, hidden: post.hidden, diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb index d49257b1458..74b4929a387 100644 --- a/app/serializers/site_serializer.rb +++ b/app/serializers/site_serializer.rb @@ -106,7 +106,7 @@ class SiteSerializer < ApplicationSerializer SiteSetting.tagging_enabled && SiteSetting.show_filter_by_tag end def top_tags - DiscourseTagging.top_tags + Tag.top_tags end end diff --git a/app/serializers/topic_list_item_serializer.rb b/app/serializers/topic_list_item_serializer.rb index 5a8ac8d3797..d3763cef165 100644 --- a/app/serializers/topic_list_item_serializer.rb +++ b/app/serializers/topic_list_item_serializer.rb @@ -68,7 +68,7 @@ class TopicListItemSerializer < ListableTopicSerializer SiteSetting.tagging_enabled end def tags - object.tags + object.tags.map(&:name) end end diff --git a/app/serializers/topic_list_serializer.rb b/app/serializers/topic_list_serializer.rb index f932b644d14..c0321c7058b 100644 --- a/app/serializers/topic_list_serializer.rb +++ b/app/serializers/topic_list_serializer.rb @@ -27,7 +27,7 @@ class TopicListSerializer < ApplicationSerializer SiteSetting.tagging_enabled && SiteSetting.show_filter_by_tag end def tags - DiscourseTagging.top_tags + Tag.top_tags end end diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb index b30d0c9e6e0..c44d44cacc0 100644 --- a/app/serializers/topic_view_serializer.rb +++ b/app/serializers/topic_view_serializer.rb @@ -33,8 +33,7 @@ class TopicViewSerializer < ApplicationSerializer :word_count, :deleted_at, :pending_posts_count, - :user_id, - :tags + :user_id attributes :draft, :draft_key, @@ -55,7 +54,8 @@ class TopicViewSerializer < ApplicationSerializer :is_warning, :chunk_size, :bookmarked, - :message_archived + :message_archived, + :tags # TODO: Split off into proper object / serializer def details @@ -231,4 +231,11 @@ class TopicViewSerializer < ApplicationSerializer scope.is_staff? && NewPostManager.queue_enabled? end + def include_tags? + SiteSetting.tagging_enabled + end + def tags + object.topic.tags.map(&:name) + end + end diff --git a/db/migrate/20160503205953_create_tags.rb b/db/migrate/20160503205953_create_tags.rb new file mode 100644 index 00000000000..6af853f7343 --- /dev/null +++ b/db/migrate/20160503205953_create_tags.rb @@ -0,0 +1,27 @@ +class CreateTags < ActiveRecord::Migration + def change + create_table :tags do |t| + t.string :name, null: false + t.integer :topic_count, null: false, default: 0 + t.timestamps + end + + create_table :topic_tags do |t| + t.references :topic, null: false + t.references :tag, null: false + t.timestamps + end + + create_table :tag_users do |t| + t.references :tag, null: false + t.references :user, null: false + t.integer :notification_level, null: false + t.timestamps + end + + add_index :tags, :name, unique: true + add_index :topic_tags, [:topic_id, :tag_id], unique: true + add_index :tag_users, [:user_id, :tag_id, :notification_level], name: "idx_tag_users_ix1", unique: true + add_index :tag_users, [:tag_id, :user_id, :notification_level], name: "idx_tag_users_ix2", unique: true + end +end diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb index 16d2625c0b0..cb5ce1d7c26 100644 --- a/lib/discourse_tagging.rb +++ b/lib/discourse_tagging.rb @@ -8,6 +8,55 @@ module DiscourseTagging # isolate_namespace DiscourseTagging # end + def self.tag_topic_by_names(topic, guardian, tag_names_arg) + if SiteSetting.tagging_enabled + tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, guardian) || [] + + old_tag_names = topic.tags.map(&:name) || [] + new_tag_names = tag_names - old_tag_names + removed_tag_names = old_tag_names - tag_names + + # Protect staff-only tags + unless guardian.is_staff? + staff_tags = DiscourseTagging.staff_only_tags(new_tag_names) + if staff_tags.present? + topic.errors[:base] << I18n.t("tags.staff_tag_disallowed", tag: staff_tags.join(" ")) + return false + end + + staff_tags = DiscourseTagging.staff_only_tags(removed_tag_names) + if staff_tags.present? + topic.errors[:base] << I18n.t("tags.staff_tag_remove_disallowed", tag: staff_tags.join(" ")) + return false + end + end + + if tag_names.present? + tags = Tag.where(name: tag_names).all + if tags.size < tag_names.size + existing_names = tags.map(&:name) + tag_names.each do |name| + next if existing_names.include?(name) + tags << Tag.create(name: name) + end + end + + auto_notify_for(tags, topic) + + topic.tags = tags + else + auto_notify_for([], topic) + topic.tags = [] + end + end + true + end + + def self.auto_notify_for(tags, topic) + TagUser.auto_watch_new_topic(topic, tags) + TagUser.auto_track_new_topic(topic, tags) + end + def self.clean_tag(tag) tag.downcase.strip[0...SiteSetting.max_tag_length].gsub(TAGS_FILTER_REGEXP, '') end @@ -36,8 +85,7 @@ module DiscourseTagging # If the user can't create tags, remove any tags that don't already exist # TODO: this is doing a full count, it should just check first or use a cache unless guardian.can_create_tag? - tag_count = TopicCustomField.where(name: TAGS_FIELD_NAME, value: tags).group(:value).count - tags.delete_if {|t| !tag_count.has_key?(t) } + tags = Tag.where(name: tags).pluck(:name) end return tags[0...SiteSetting.max_tags_per_topic] @@ -47,68 +95,6 @@ module DiscourseTagging "tags_notification:#{tag_id}" end - def self.auto_notify_for(tags, topic) - # This insert will run up to SiteSetting.max_tags_per_topic times - tags.each do |tag| - key_name_sql = ActiveRecord::Base.sql_fragment("('#{notification_key(tag)}')", tag) - - sql = <<-SQL - INSERT INTO topic_users(user_id, topic_id, notification_level, notifications_reason_id) - SELECT ucf.user_id, - #{topic.id.to_i}, - CAST(ucf.value AS INTEGER), - #{TopicUser.notification_reasons[:plugin_changed]} - FROM user_custom_fields AS ucf - WHERE ucf.name IN #{key_name_sql} - AND NOT EXISTS(SELECT 1 FROM topic_users WHERE topic_id = #{topic.id.to_i} AND user_id = ucf.user_id) - AND CAST(ucf.value AS INTEGER) <> #{TopicUser.notification_levels[:regular]} - SQL - - ActiveRecord::Base.exec_sql(sql) - end - end - - def self.rename_tag(current_user, old_id, new_id) - sql = <<-SQL - UPDATE topic_custom_fields AS tcf - SET value = :new_id - WHERE value = :old_id - AND name = :tags_field_name - AND NOT EXISTS(SELECT 1 - FROM topic_custom_fields - WHERE value = :new_id AND name = :tags_field_name AND topic_id = tcf.topic_id) - SQL - - user_sql = <<-SQL - UPDATE user_custom_fields - SET name = :new_user_tag_id - WHERE name = :old_user_tag_id - AND NOT EXISTS(SELECT 1 - FROM user_custom_fields - WHERE name = :new_user_tag_id) - SQL - - ActiveRecord::Base.transaction do - ActiveRecord::Base.exec_sql(sql, new_id: new_id, old_id: old_id, tags_field_name: TAGS_FIELD_NAME) - TopicCustomField.delete_all(name: TAGS_FIELD_NAME, value: old_id) - ActiveRecord::Base.exec_sql(user_sql, new_user_tag_id: notification_key(new_id), - old_user_tag_id: notification_key(old_id)) - UserCustomField.delete_all(name: notification_key(old_id)) - StaffActionLogger.new(current_user).log_custom('renamed_tag', previous_value: old_id, new_value: new_id) - end - end - - def self.top_tags(limit_arg=nil) - # TODO: cache - # TODO: need an index for this (name,value) - TopicCustomField.where(name: TAGS_FIELD_NAME) - .group(:value) - .limit(limit_arg || SiteSetting.max_tags_in_filter_list) - .order('COUNT(value) DESC') - .count - .map {|name, count| name} - end - def self.muted_tags(user) return [] unless user UserCustomField.where(user_id: user.id, value: TopicUser.notification_levels[:muted]).pluck(:name).map { |x| x[0,17] == "tags_notification" ? x[18..-1] : nil}.compact diff --git a/lib/post_creator.rb b/lib/post_creator.rb index 005932a8e59..47d1540379a 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -147,7 +147,6 @@ class PostCreator track_latest_on_category enqueue_jobs BadgeGranter.queue_badge_grant(Badge::Trigger::PostRevision, post: @post) - auto_notify_for_tags trigger_after_events(@post) @@ -439,17 +438,6 @@ class PostCreator PostJobsEnqueuer.new(@post, @topic, new_topic?, {import_mode: @opts[:import_mode]}).enqueue_jobs end - def auto_notify_for_tags - if SiteSetting.tagging_enabled - tags = DiscourseTagging.tags_for_saving(@opts[:tags], @guardian) - if tags.present? - @topic.custom_fields.update(DiscourseTagging::TAGS_FIELD_NAME => tags) - @topic.save - DiscourseTagging.auto_notify_for(tags, @topic) - end - end - end - def new_topic? @opts[:topic_id].blank? end diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb index d1fb4bcea8b..ec78713495b 100644 --- a/lib/post_revisor.rb +++ b/lib/post_revisor.rb @@ -72,51 +72,15 @@ class PostRevisor tc.check_result(tc.topic.change_category_to_id(category_id)) end - track_topic_field(:tags_empty_array) do |tc, val| - if val.present? - unless tc.guardian.is_staff? - old_tags = tc.topic.tags || [] - staff_tags = DiscourseTagging.staff_only_tags(old_tags) - if staff_tags.present? - tc.topic.errors[:base] << I18n.t("tags.staff_tag_remove_disallowed", tag: staff_tags.join(" ")) - tc.check_result(false) - next - end - end - - tc.record_change(DiscourseTagging::TAGS_FIELD_NAME, tc.topic.custom_fields[DiscourseTagging::TAGS_FIELD_NAME], nil) - tc.topic.custom_fields.delete(DiscourseTagging::TAGS_FIELD_NAME) - end - end - track_topic_field(:tags) do |tc, tags| - if tags.present? && tc.guardian.can_tag_topics? - tags = DiscourseTagging.tags_for_saving(tags, tc.guardian) - old_tags = tc.topic.tags || [] - - new_tags = tags - old_tags - removed_tags = old_tags - tags - - unless tc.guardian.is_staff? - staff_tags = DiscourseTagging.staff_only_tags(new_tags) - if staff_tags.present? - tc.topic.errors[:base] << I18n.t("tags.staff_tag_disallowed", tag: staff_tags.join(" ")) - tc.check_result(false) - next - end - - staff_tags = DiscourseTagging.staff_only_tags(removed_tags) - if staff_tags.present? - tc.topic.errors[:base] << I18n.t("tags.staff_tag_remove_disallowed", tag: staff_tags.join(" ")) - tc.check_result(false) - next - end + if tc.guardian.can_tag_topics? + prev_tags = tc.topic.tags.map(&:name) + next if tags.blank? && prev_tags.blank? + if !DiscourseTagging.tag_topic_by_names(tc.topic, tc.guardian, tags) + tc.check_result(false) + next end - - tc.record_change(DiscourseTagging::TAGS_FIELD_NAME, tc.topic.custom_fields[DiscourseTagging::TAGS_FIELD_NAME], tags) - tc.topic.custom_fields.update(DiscourseTagging::TAGS_FIELD_NAME => tags) - - DiscourseTagging.auto_notify_for(new_tags, tc.topic) if new_tags.present? + tc.record_change('tags', prev_tags, tags) end end diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index e1341006f38..9551a41972c 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -77,8 +77,8 @@ module PrettyText if !is_tag && category = Category.query_from_hashtag_slug(text) [category.url_with_id, text] - elsif is_tag && tag = TopicCustomField.find_by(name: DiscourseTagging::TAGS_FIELD_NAME, value: text.gsub!("#{tag_postfix}", '')) - ["#{Discourse.base_url}/tags/#{tag.value}", text] + elsif is_tag && tag = Tag.find_by_name(text.gsub!("#{tag_postfix}", '')) + ["#{Discourse.base_url}/tags/#{tag.name}", text] else nil end diff --git a/lib/search.rb b/lib/search.rb index 22cb3f79c0c..4de9c8a528b 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -348,10 +348,10 @@ class Search tags = match.split(",") posts.where("topics.id IN ( - SELECT tc.topic_id - FROM topic_custom_fields tc - WHERE tc.name = '#{DiscourseTagging::TAGS_FIELD_NAME}' AND - tc.value in (?) + SELECT DISTINCT(tt.topic_id) + FROM topic_tags tt, tags + WHERE tt.tag_id = tags.id + AND tags.name in (?) )", tags) end diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb index 53409a1837f..1e683f5b447 100644 --- a/lib/topic_creator.rb +++ b/lib/topic_creator.rb @@ -39,6 +39,8 @@ class TopicCreator def create topic = Topic.new(setup_topic_params) + setup_tags(topic) + DiscourseEvent.trigger(:before_create_topic, topic, self) setup_auto_close_time(topic) @@ -90,8 +92,11 @@ class TopicCreator end unless topic.private_message? + # In order of importance: CategoryUser.auto_watch_new_topic(topic) CategoryUser.auto_track_new_topic(topic) + TagUser.auto_watch_new_topic(topic) + TagUser.auto_track_new_topic(topic) end end @@ -141,6 +146,10 @@ class TopicCreator end end + def setup_tags(topic) + DiscourseTagging.tag_topic_by_names(topic, @guardian, @opts[:tags]) + end + def setup_auto_close_time(topic) return unless @opts[:auto_close_time].present? return unless @guardian.can_moderate?(topic) diff --git a/lib/topic_query.rb b/lib/topic_query.rb index 8c9ba0d1a34..65696d64c8a 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -20,6 +20,7 @@ class TopicQuery topic_ids visible category + tags order ascending no_subcategories @@ -451,6 +452,20 @@ class TopicQuery result = result.references(:categories) end + # ALL TAGS: something like this? + # Topic.joins(:tags).where('tags.name in (?)', @options[:tags]).group('topic_id').having('count(*)=?', @options[:tags].size).select('topic_id') + + if @options[:tags] && @options[:tags].size > 0 + result = result.joins(:tags).preload(:tags) + + # ANY of the given tags: + if @options[:tags][0].is_a?(Integer) + result = result.where("tags.id in (?)", @options[:tags]) + else + result = result.where("tags.name in (?)", @options[:tags]) + end + end + result = apply_ordering(result, options) result = result.listable_topics.includes(:category) diff --git a/lib/topics_bulk_action.rb b/lib/topics_bulk_action.rb index 36c17f228ee..2b370911309 100644 --- a/lib/topics_bulk_action.rb +++ b/lib/topics_bulk_action.rb @@ -137,12 +137,11 @@ class TopicsBulkAction topics.each do |t| if guardian.can_edit?(t) if tags.present? - t.custom_fields.update(DiscourseTagging::TAGS_FIELD_NAME => tags) - t.save - DiscourseTagging.auto_notify_for(tags, t) + DiscourseTagging.tag_topic_by_names(t, guardian, tags) else - t.custom_fields.delete(DiscourseTagging::TAGS_FIELD_NAME) + t.tags = [] end + @changed_ids << t.id end end end diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb index 1b3c59399ad..1c647fef7a8 100644 --- a/spec/components/post_creator_spec.rb +++ b/spec/components/post_creator_spec.rb @@ -265,6 +265,59 @@ describe PostCreator do end + context "tags" do + let(:tag_names) { ['art', 'science', 'dance'] } + let(:creator_with_tags) { PostCreator.new(user, basic_topic_params.merge(tags: tag_names)) } + + context "tagging disabled" do + before do + SiteSetting.tagging_enabled = false + end + + it "doesn't create tags" do + expect { @post = creator_with_tags.create }.to change { Tag.count }.by(0) + expect(@post.topic.tags.size).to eq(0) + end + end + + context "tagging enabled" do + before do + SiteSetting.tagging_enabled = true + end + + context "can create tags" do + before do + SiteSetting.min_trust_to_create_tag = 0 + SiteSetting.min_trust_level_to_tag_topics = 0 + end + + it "can create all tags if none exist" do + expect { @post = creator_with_tags.create }.to change { Tag.count }.by( tag_names.size ) + expect(@post.topic.tags.map(&:name).sort).to eq(tag_names.sort) + end + + it "creates missing tags if some exist" do + existing_tag1 = Fabricate(:tag, name: tag_names[0]) + existing_tag1 = Fabricate(:tag, name: tag_names[1]) + expect { @post = creator_with_tags.create }.to change { Tag.count }.by( tag_names.size - 2 ) + expect(@post.topic.tags.map(&:name).sort).to eq(tag_names.sort) + end + end + + context "cannot create tags" do + before do + SiteSetting.min_trust_to_create_tag = 4 + SiteSetting.min_trust_level_to_tag_topics = 0 + end + + it "only uses existing tags" do + existing_tag1 = Fabricate(:tag, name: tag_names[1]) + expect { @post = creator_with_tags.create }.to change { Tag.count }.by(0) + expect(@post.topic.tags.map(&:name)).to eq([existing_tag1.name]) + end + end + end + end end context 'when auto-close param is given' do diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb index c88e7e78e41..9cf5b3ee594 100644 --- a/spec/components/post_revisor_spec.rb +++ b/spec/components/post_revisor_spec.rb @@ -362,5 +362,131 @@ describe PostRevisor do expect(payload[:reload_topic]).to eq(true) end end + + context "tagging" do + context "tagging disabled" do + before do + SiteSetting.tagging_enabled = false + end + + it "doesn't add the tags" do + result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] }) + expect(result).to eq(true) + post.reload + expect(post.topic.tags.size).to eq(0) + end + end + + context "tagging enabled" do + before do + SiteSetting.tagging_enabled = true + end + + context "can create tags" do + before do + SiteSetting.min_trust_to_create_tag = 0 + SiteSetting.min_trust_level_to_tag_topics = 0 + end + + it "can create all tags if none exist" do + expect { + @result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] }) + }.to change { Tag.count }.by(2) + expect(@result).to eq(true) + post.reload + expect(post.topic.tags.map(&:name).sort).to eq(['totally', 'update']) + end + + it "creates missing tags if some exist" do + Fabricate(:tag, name: 'totally') + expect { + @result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] }) + }.to change { Tag.count }.by(1) + expect(@result).to eq(true) + post.reload + expect(post.topic.tags.map(&:name).sort).to eq(['totally', 'update']) + end + + it "can remove all tags" do + topic.tags = [Fabricate(:tag, name: "super"), Fabricate(:tag, name: "stuff")] + result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: [] }) + expect(result).to eq(true) + post.reload + expect(post.topic.tags.size).to eq(0) + end + + it "can't add staff-only tags" do + SiteSetting.staff_tags = "important" + result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['important', 'stuff'] }) + expect(result).to eq(false) + expect(post.topic.errors.present?).to eq(true) + end + + it "staff can add staff-only tags" do + SiteSetting.staff_tags = "important" + result = subject.revise!(Fabricate(:admin), { raw: "lets totally update the body", tags: ['important', 'stuff'] }) + expect(result).to eq(true) + post.reload + expect(post.topic.tags.map(&:name).sort).to eq(['important', 'stuff']) + end + + context "with staff-only tags" do + before do + SiteSetting.staff_tags = "important" + topic = post.topic + topic.tags = [Fabricate(:tag, name: "super"), Fabricate(:tag, name: "important"), Fabricate(:tag, name: "stuff")] + end + + it "staff-only tags can't be removed" do + result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['stuff'] }) + expect(result).to eq(false) + expect(post.topic.errors.present?).to eq(true) + post.reload + expect(post.topic.tags.map(&:name).sort).to eq(['important', 'stuff', 'super']) + end + + it "can't remove all tags if some are staff-only" do + result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: [] }) + expect(result).to eq(false) + expect(post.topic.errors.present?).to eq(true) + post.reload + expect(post.topic.tags.map(&:name).sort).to eq(['important', 'stuff', 'super']) + end + + it "staff-only tags can be removed by staff" do + result = subject.revise!(Fabricate(:admin), { raw: "lets totally update the body", tags: ['stuff'] }) + expect(result).to eq(true) + post.reload + expect(post.topic.tags.map(&:name)).to eq(['stuff']) + end + + it "staff can remove all tags" do + result = subject.revise!(Fabricate(:admin), { raw: "lets totally update the body", tags: [] }) + expect(result).to eq(true) + post.reload + expect(post.topic.tags.size).to eq(0) + end + end + + end + + context "cannot create tags" do + before do + SiteSetting.min_trust_to_create_tag = 4 + SiteSetting.min_trust_level_to_tag_topics = 0 + end + + it "only uses existing tags" do + Fabricate(:tag, name: 'totally') + expect { + @result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] }) + }.to_not change { Tag.count } + expect(@result).to eq(true) + post.reload + expect(post.topic.tags.map(&:name)).to eq(['totally']) + end + end + end + end end end diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index d66de21387c..430bf7bad81 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -417,12 +417,12 @@ HTML describe "tag and category links" do it "produces tag links" do - # TODO where is our tags table? - TopicCustomField.create!(topic_id: 1, name: DiscourseTagging::TAGS_FIELD_NAME, value: "known") - # TODO does it make sense to generate hashtags for tags that are missing in action? + Fabricate(:topic, {tags: [Fabricate(:tag, name: 'known')]}) expect(PrettyText.cook(" #unknown::tag #known::tag")).to match_html("

#unknown::tag #known

") end + # TODO does it make sense to generate hashtags for tags that are missing in action? + end end diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb index 8d14de9411d..128c7764629 100644 --- a/spec/components/search_spec.rb +++ b/spec/components/search_spec.rb @@ -553,6 +553,16 @@ describe Search do expect(Search.execute('testing again #category-24:sub-category').posts.length).to eq(1) expect(Search.execute('testing again #sub-category').posts.length).to eq(0) end + + it "can find with tag" do + topic1 = Fabricate(:topic, title: 'Could not, would not, on a boat') + topic1.tags = [Fabricate(:tag, name: 'eggs'), Fabricate(:tag, name: 'ham')] + post1 = Fabricate(:post, topic: topic1) + post2 = Fabricate(:post, topic: topic1, raw: "It probably doesn't help that they're green...") + + expect(Search.execute('green tags:eggs').posts.map(&:id)).to eq([post2.id]) + expect(Search.execute('green tags:plants').posts.size).to eq(0) + end end it 'can parse complex strings using ts_query helper' do diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb index fcb0bb1f8a6..663fdef532d 100644 --- a/spec/components/topic_query_spec.rb +++ b/spec/components/topic_query_spec.rb @@ -112,8 +112,47 @@ describe TopicQuery do end end + end + context 'tag filter' do + let(:tag) { Fabricate(:tag) } + let(:other_tag) { Fabricate(:tag) } + it "returns topics with the tag when filtered to it" do + tagged_topic1 = Fabricate(:topic, {tags: [tag]}) + tagged_topic2 = Fabricate(:topic, {tags: [other_tag]}) + tagged_topic3 = Fabricate(:topic, {tags: [tag, other_tag]}) + no_tags_topic = Fabricate(:topic) + + expect(TopicQuery.new(moderator, tags: [tag.name]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic3.id].sort) + expect(TopicQuery.new(moderator, tags: [tag.id]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic3.id].sort) + + two_tag_topic = TopicQuery.new(moderator, tags: [tag.name]).list_latest.topics.find { |t| t.id == tagged_topic3.id } + expect(two_tag_topic.tags.size).to eq(2) + + # topics with ANY of the given tags: + expect(TopicQuery.new(moderator, tags: [tag.name, other_tag.name]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic2.id, tagged_topic3.id].sort) + expect(TopicQuery.new(moderator, tags: [tag.id, other_tag.id]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic2.id, tagged_topic3.id].sort) + + # TODO: topics with ALL of the given tags: + # expect(TopicQuery.new(moderator, tags: [tag.name, other_tag.name]).list_latest.topics.map(&:id)).to eq([tagged_topic3.id].sort) + # expect(TopicQuery.new(moderator, tags: [tag.id, other_tag.id]).list_latest.topics.map(&:id)).to eq([tagged_topic3.id].sort) + end + + context "and categories too" do + let(:category1) { Fabricate(:category) } + let(:category2) { Fabricate(:category) } + + it "returns topics in the given category with the given tag" do + tagged_topic1 = Fabricate(:topic, {category: category1, tags: [tag]}) + tagged_topic2 = Fabricate(:topic, {category: category2, tags: [tag]}) + tagged_topic3 = Fabricate(:topic, {category: category1, tags: [tag, other_tag]}) + no_tags_topic = Fabricate(:topic, {category: category1}) + + expect(TopicQuery.new(moderator, category: category1.id, tags: [tag.name]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic3.id].sort) + expect(TopicQuery.new(moderator, category: category2.id, tags: [other_tag.name]).list_latest.topics.size).to eq(0) + end + end end context 'muted categories' do diff --git a/spec/components/topics_bulk_action_spec.rb b/spec/components/topics_bulk_action_spec.rb index 0003ee2dc5c..6aa99fcd106 100644 --- a/spec/components/topics_bulk_action_spec.rb +++ b/spec/components/topics_bulk_action_spec.rb @@ -180,4 +180,56 @@ describe TopicsBulkAction do end end end + + describe "change_tags" do + let(:topic) { Fabricate(:topic) } + let(:tag1) { Fabricate(:tag) } + let(:tag2) { Fabricate(:tag) } + + before do + SiteSetting.tagging_enabled = true + SiteSetting.min_trust_level_to_tag_topics = 0 + topic.tags = [tag1, tag2] + end + + it "can change the tags, and can create new tags" do + SiteSetting.min_trust_to_create_tag = 0 + tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_tags', tags: ['newtag', tag1.name]) + topic_ids = tba.perform! + expect(topic_ids).to eq([topic.id]) + topic.reload + expect(topic.tags.map(&:name).sort).to eq(['newtag', tag1.name].sort) + end + + it "can change the tags but not create new ones" do + SiteSetting.min_trust_to_create_tag = 4 + tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_tags', tags: ['newtag', tag1.name]) + topic_ids = tba.perform! + expect(topic_ids).to eq([topic.id]) + topic.reload + expect(topic.tags.map(&:name)).to eq([tag1.name]) + end + + it "can remove all tags" do + tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_tags', tags: []) + topic_ids = tba.perform! + expect(topic_ids).to eq([topic.id]) + topic.reload + expect(topic.tags.size).to eq(0) + end + + context "when user can't edit topic" do + before do + Guardian.any_instance.expects(:can_edit?).returns(false) + end + + it "doesn't change the tags" do + tba = TopicsBulkAction.new(topic.user, [topic.id], type: 'change_tags', tags: ['newtag', tag1.name]) + topic_ids = tba.perform! + expect(topic_ids).to eq([]) + topic.reload + expect(topic.tags.map(&:name)).to eq([tag1.name, tag2.name]) + end + end + end end diff --git a/spec/fabricators/tag_fabricator.rb b/spec/fabricators/tag_fabricator.rb new file mode 100644 index 00000000000..45940081a1c --- /dev/null +++ b/spec/fabricators/tag_fabricator.rb @@ -0,0 +1,3 @@ +Fabricator(:tag) do + name { sequence(:name) { |i| "tag#{i}" } } +end diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb new file mode 100644 index 00000000000..22cda4a4b99 --- /dev/null +++ b/spec/models/tag_spec.rb @@ -0,0 +1,32 @@ +require 'rails_helper' + +describe Tag do + describe '#tags_by_count_query' do + it "returns empty hash if nothing is tagged" do + expect(described_class.tags_by_count_query.count).to eq({}) + end + + context "with some tagged topics" do + before do + @topics = [] + @tags = [] + 3.times { @topics << Fabricate(:topic) } + 2.times { @tags << Fabricate(:tag) } + @topics[0].tags << @tags[0] + @topics[0].tags << @tags[1] + @topics[1].tags << @tags[0] + end + + it "returns tag names with topic counts in a hash" do + counts = described_class.tags_by_count_query.count + expect(counts[@tags[0].name]).to eq(2) + expect(counts[@tags[1].name]).to eq(1) + end + + it "can be used to filter before doing the count" do + counts = described_class.tags_by_count_query.where("topics.id = ?", @topics[1].id).count + expect(counts).to eq({@tags[0].name => 1}) + end + end + end +end diff --git a/spec/models/tag_user_spec.rb b/spec/models/tag_user_spec.rb new file mode 100644 index 00000000000..5b1753bbfbc --- /dev/null +++ b/spec/models/tag_user_spec.rb @@ -0,0 +1,87 @@ +# encoding: utf-8 + +require 'rails_helper' +require_dependency 'post_creator' + +describe TagUser do + + context "integration" do + before do + ActiveRecord::Base.observers.enable :all + SiteSetting.tagging_enabled = true + SiteSetting.min_trust_to_create_tag = 0 + SiteSetting.min_trust_level_to_tag_topics = 0 + end + + let(:user) { Fabricate(:user) } + + let(:watched_tag) { Fabricate(:tag) } + let(:muted_tag) { Fabricate(:tag) } + let(:tracked_tag) { Fabricate(:tag) } + + context "with some tag notification settings" do + before do + TagUser.create!(user: user, tag: watched_tag, notification_level: TagUser.notification_levels[:watching]) + TagUser.create!(user: user, tag: muted_tag, notification_level: TagUser.notification_levels[:muted]) + TagUser.create!(user: user, tag: tracked_tag, notification_level: TagUser.notification_levels[:tracking]) + end + + it "sets notification levels correctly" do + watched_post = create_post(tags: [watched_tag.name]) + muted_post = create_post(tags: [muted_tag.name]) + tracked_post = create_post(tags: [tracked_tag.name]) + + expect(Notification.where(user_id: user.id, topic_id: watched_post.topic_id).count).to eq 1 + expect(Notification.where(user_id: user.id, topic_id: tracked_post.topic_id).count).to eq 0 + + tu = TopicUser.get(tracked_post.topic, user) + expect(tu.notification_level).to eq TopicUser.notification_levels[:tracking] + expect(tu.notifications_reason_id).to eq TopicUser.notification_reasons[:auto_track_tag] + end + + it "sets notification level to the highest one if there are multiple tags" do + post = create_post(tags: [muted_tag.name, tracked_tag.name, watched_tag.name]) + expect(Notification.where(user_id: user.id, topic_id: post.topic_id).count).to eq 1 + tu = TopicUser.get(post.topic, user) + expect(tu.notification_level).to eq TopicUser.notification_levels[:watching] + expect(tu.notifications_reason_id).to eq TopicUser.notification_reasons[:auto_watch_tag] + end + + it "can start watching after tag has been added" do + post = create_post + expect(TopicUser.get(post.topic, user)).to be_blank + DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(user), [watched_tag.name]) + tu = TopicUser.get(post.topic, user) + expect(tu.notification_level).to eq(TopicUser.notification_levels[:watching]) + end + + it "can start watching after tag has changed" do + post = create_post(tags: [Fabricate(:tag).name]) + expect(TopicUser.get(post.topic, user)).to be_blank + DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(user), [watched_tag.name]) + tu = TopicUser.get(post.topic, user) + expect(tu.notification_level).to eq(TopicUser.notification_levels[:watching]) + end + + it "can stop watching after tag has changed" do + post = create_post(tags: [watched_tag.name]) + expect(TopicUser.get(post.topic, user)).to be_present + DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(user), [Fabricate(:tag).name]) + expect(TopicUser.get(post.topic, user)).to be_blank + end + + it "can stop watching after tags have been removed" do + post = create_post(tags: [muted_tag.name, tracked_tag.name, watched_tag.name]) + expect(TopicUser.get(post.topic, user)).to be_present + DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(user), []) + expect(TopicUser.get(post.topic, user)).to be_blank + end + + it "is destroyed when a user is deleted" do + expect(TagUser.where(user_id: user.id).count).to eq(3) + user.destroy! + expect(TagUser.where(user_id: user.id).count).to eq(0) + end + end + end +end From af1c99494013f38807529176be91383b675facd3 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 26 May 2016 14:57:43 -0700 Subject: [PATCH 015/320] FIX: QSG incorrectly referred to meta category --- docs/ADMIN-QUICK-START-GUIDE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md index 5c32d211246..1c1000d6df1 100644 --- a/docs/ADMIN-QUICK-START-GUIDE.md +++ b/docs/ADMIN-QUICK-START-GUIDE.md @@ -121,7 +121,7 @@ Right now [your FAQ](/faq) is the same Creative Commons [universal rules of civi However, if you want to set up a more detailed FAQ dealing with the specifics of *your* community, here's how: -1. Create a new [meta topic](category/meta), titled "Frequently Asked Questions (FAQ)" or similar. +1. Create a new [site feedback topic](category/site-feedback), titled "Frequently Asked Questions (FAQ)" or similar. 2. Use the admin wrench icon below the post to make it a wiki post. This means the post is now editable to any user with a trust level of 1 or higher. @@ -135,7 +135,7 @@ Now you have a community FAQ for your site that is collaboratively editable, and You have three default categories: -1. [Meta](/category/meta) – general discussion about the site itself. [It's important!](https://meta.discourse.org/t/what-is-meta/5249) +1. [Site Feedback](/category/site-feedback) – general discussion about the site itself. [It's important!](https://meta.discourse.org/t/5249) 2. [Lounge](/category/lounge) – a perk for users at trust level 3 and higher 3. [Staff](/category/staff) – visible only to staff (admins and moderators) From 3d5716a2c8949d92394752b31cb7d0aff0b8dd20 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 26 May 2016 17:24:03 -0400 Subject: [PATCH 016/320] FIX: tag input doesn't show staff-only tags to non-staff --- .../javascripts/discourse/components/tag-chooser.js.es6 | 2 +- app/controllers/tags_controller.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 index c942cf59933..88e7577d1e2 100644 --- a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 +++ b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 @@ -78,7 +78,7 @@ export default Ember.TextField.extend({ url: Discourse.getURL("/tags/filter/search"), dataType: 'json', data: function (term) { - return { q: term, limit: self.siteSettings.max_tag_search_results }; + return { q: term, limit: self.siteSettings.max_tag_search_results, filterForInput: true }; }, results: function (data) { if (self.siteSettings.tags_sort_alphabetically) { diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 23eac88860a..c5040d3a2bc 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -112,6 +112,11 @@ class TagsController < ::ApplicationController query = query.where('tags.name like ?', "%#{term}%") end + if params[:filterForInput] && !guardian.is_staff? + staff_tag_names = SiteSetting.staff_tags.split("|") + query = query.where('tags.name NOT IN (?)', staff_tag_names) if staff_tag_names.present? + end + tags = query.count.map {|t, c| { id: t, text: t, count: c } } render json: { results: tags } From 884779b5c18f1b963e532d904198df7e00cf9dda Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 26 May 2016 18:03:36 -0400 Subject: [PATCH 017/320] FIX: N+1 query when tagging enabled and no tags in topic list query. Topic query ignored tags input when tagging is disabled. --- lib/topic_query.rb | 18 +++++++++++------- spec/components/topic_query_spec.rb | 4 ++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/topic_query.rb b/lib/topic_query.rb index 65696d64c8a..d2add0c9bb1 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -455,14 +455,18 @@ class TopicQuery # ALL TAGS: something like this? # Topic.joins(:tags).where('tags.name in (?)', @options[:tags]).group('topic_id').having('count(*)=?', @options[:tags].size).select('topic_id') - if @options[:tags] && @options[:tags].size > 0 - result = result.joins(:tags).preload(:tags) + if SiteSetting.tagging_enabled + result = result.preload(:tags) - # ANY of the given tags: - if @options[:tags][0].is_a?(Integer) - result = result.where("tags.id in (?)", @options[:tags]) - else - result = result.where("tags.name in (?)", @options[:tags]) + if @options[:tags] && @options[:tags].size > 0 + result = result.joins(:tags) + + # ANY of the given tags: + if @options[:tags][0].is_a?(Integer) + result = result.where("tags.id in (?)", @options[:tags]) + else + result = result.where("tags.name in (?)", @options[:tags]) + end end end diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb index 663fdef532d..d3298a9dcdd 100644 --- a/spec/components/topic_query_spec.rb +++ b/spec/components/topic_query_spec.rb @@ -118,6 +118,10 @@ describe TopicQuery do let(:tag) { Fabricate(:tag) } let(:other_tag) { Fabricate(:tag) } + before do + SiteSetting.tagging_enabled = true + end + it "returns topics with the tag when filtered to it" do tagged_topic1 = Fabricate(:topic, {tags: [tag]}) tagged_topic2 = Fabricate(:topic, {tags: [other_tag]}) From 17ebcdd413649220449497e1046bf07f68f286f1 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 26 May 2016 15:05:41 -0700 Subject: [PATCH 018/320] very minor typo --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index db341f15c55..6729cbae3a1 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -928,7 +928,7 @@ en: allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines." email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net" email_domains_whitelist: "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!" - forgot_password_strict: "Don't inform users of an account's existance when they use the forgot password dialog." + forgot_password_strict: "Don't inform users of an account's existence when they use the forgot password dialog." log_out_strict: "When logging out, log out ALL sessions for the user on all devices" version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard" new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available." From 89b730600accfaec1f07703369762406e151ead7 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 26 May 2016 15:23:15 -0700 Subject: [PATCH 019/320] QSG: improve pin description --- docs/ADMIN-QUICK-START-GUIDE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md index 1c1000d6df1..7af407c95c0 100644 --- a/docs/ADMIN-QUICK-START-GUIDE.md +++ b/docs/ADMIN-QUICK-START-GUIDE.md @@ -92,8 +92,8 @@ Your welcome topic is important because it is the first thing you visitors will Note that pinning topics works a little differently in Discourse: -- Users can hide pins on topics once they have read them via the controls at the bottom of the topic, so they aren't always pinned forever for everyone. -- When you pin a topic, you can choose to pin it globally to all topic lists, or pin it only within its category. +- Once someone reads to the bottom of a pinned topic, it is automatically unpinned for them specifically. They can change this via the personal pin controls at the bottom of the topic. +- When staff pins a topic, they can pin it globally to all topic lists, or just within its category. If a pin isn't visible enough, you can also turn one single topic into a **banner**. The banner topic floats on top of all topics and all primary pages. Users can permanently dismiss this floating banner by clicking the × in the upper right corner. From 8c3a0b44baea3388db4b719766a961d3a2114fc9 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 27 May 2016 12:07:10 +1000 Subject: [PATCH 020/320] FIX: restore "every email" default for old accounts in mailing list mode - Change default for mailing list mode frequency to daily - Remove bootbox warning for mailing list mode (cause default is daily) --- .../discourse/controllers/preferences.js.es6 | 15 --------------- .../discourse/templates/user/preferences.hbs | 2 +- config/locales/client.en.yml | 10 +++------- config/site_settings.yml | 2 +- ...7015355_correct_mailing_list_mode_frequency.rb | 10 ++++++++++ 5 files changed, 15 insertions(+), 24 deletions(-) create mode 100644 db/migrate/20160527015355_correct_mailing_list_mode_frequency.rb diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6 index 729f749af15..c9dd265c4cf 100644 --- a/app/assets/javascripts/discourse/controllers/preferences.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6 @@ -130,21 +130,6 @@ export default Ember.Controller.extend(CanCheckEmails, { actions: { - checkMailingList(){ - Em.run.next(()=>{ - const postsPerDay = this.get('model.mailing_list_posts_per_day'); - if (!postsPerDay || postsPerDay < 2) { - return true; - } - - bootbox.confirm(I18n.t("user.enable_mailing_list", {count: postsPerDay}), I18n.t("no_value"), I18n.t("yes_value"), (success) => { - if (!success) { - this.set('model.user_option.mailing_list_mode', false); - } - }); - }); - }, - save() { this.set('saved', false); diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs index cb9b9e6c1f7..a69a8b6295f 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs @@ -203,7 +203,7 @@ {{#unless siteSettings.disable_mailing_list_mode}}
- {{preference-checkbox labelKey="user.mailing_list_mode.enabled" warning="checkMailingList" checked=model.user_option.mailing_list_mode}} + {{preference-checkbox labelKey="user.mailing_list_mode.enabled" checked=model.user_option.mailing_list_mode}}
{{{i18n 'user.mailing_list_mode.instructions'}}}
{{#if model.user_option.mailing_list_mode}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 50f7a44d46c..a6dcf4e17a9 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -507,12 +507,12 @@ en: email_activity_summary: "Activity Summary" mailing_list_mode: label: "Mailing list mode" - enabled: "Enable mailing list mode." + enabled: "Enable mailing list mode" instructions: | This setting overrides the activity summary.
Muted topics and categories are not included in these emails. - daily: "Send daily updates." - individual: "Send an email for every new post." + daily: "Send daily updates" + individual: "Send an email for every new post" many_per_day: "Send me an email for every new post (about {{dailyEmailEstimate}} per day)." few_per_day: "Send me an email for every new post (less than 2 per day)." watched_categories: "Watched" @@ -676,10 +676,6 @@ en: other_settings: "Other" categories_settings: "Categories" - enable_mailing_list: - one: "Are you sure you want to be emailed for every new post?" - other: "Are you sure you want to be emailed for every new post?

This will result in approximately {{count}} emails per day." - new_topic_duration: label: "Consider topics new when" not_viewed: "I haven't viewed them yet" diff --git a/config/site_settings.yml b/config/site_settings.yml index a6a000ad4c0..828ddf1dde2 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1139,7 +1139,7 @@ user_preferences: default_email_mailing_list_mode: false default_email_mailing_list_mode_frequency: enum: 'MailingListModeSiteSetting' - default: 1 + default: 0 disable_mailing_list_mode: default: false client: true diff --git a/db/migrate/20160527015355_correct_mailing_list_mode_frequency.rb b/db/migrate/20160527015355_correct_mailing_list_mode_frequency.rb new file mode 100644 index 00000000000..bcbdcd03640 --- /dev/null +++ b/db/migrate/20160527015355_correct_mailing_list_mode_frequency.rb @@ -0,0 +1,10 @@ +class CorrectMailingListModeFrequency < ActiveRecord::Migration + def up + # historically mailing list mode was for every message + # keep working the same way for all old users + execute 'UPDATE user_options SET mailing_list_mode_frequency = 1 where mailing_list_mode' + end + + def down + end +end From bd9bc7918ccf29820415a9c1caa809e797fa6bcc Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 27 May 2016 12:18:54 +1000 Subject: [PATCH 021/320] FIX: downcase developer emails do it matches internal email storage --- config/environments/development.rb | 2 +- config/environments/production.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index ee06ba01b4f..7079245f7dc 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -49,6 +49,6 @@ Discourse::Application.configure do require 'rbtrace' if emails = GlobalSetting.developer_emails - config.developer_emails = emails.split(",").map(&:strip) + config.developer_emails = emails.split(",").map(&:downcase).map(&:strip) end end diff --git a/config/environments/production.rb b/config/environments/production.rb index 35c21bf226b..f73b6e2dc9b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -60,7 +60,7 @@ Discourse::Application.configure do # developers have god like rights and may impersonate anyone in the system # normal admins may only impersonate other moderators (not admins) if emails = GlobalSetting.developer_emails - config.developer_emails = emails.split(",").map(&:strip) + config.developer_emails = emails.split(",").map(&:downcase).map(&:strip) end end From efc45aa704f15ec71cce65100f8290c5e59efa29 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 27 May 2016 12:35:22 +1000 Subject: [PATCH 022/320] correct specs --- spec/jobs/notify_mailing_list_subscribers_spec.rb | 5 ++++- spec/models/topic_user_spec.rb | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spec/jobs/notify_mailing_list_subscribers_spec.rb b/spec/jobs/notify_mailing_list_subscribers_spec.rb index 75e32073d99..aa311c0385f 100644 --- a/spec/jobs/notify_mailing_list_subscribers_spec.rb +++ b/spec/jobs/notify_mailing_list_subscribers_spec.rb @@ -3,7 +3,10 @@ require "rails_helper" describe Jobs::NotifyMailingListSubscribers do context "with mailing list on" do - before { SiteSetting.default_email_mailing_list_mode = true } + before do + SiteSetting.default_email_mailing_list_mode = true + SiteSetting.default_email_mailing_list_mode_frequency = 1 + end let(:user) { Fabricate(:user) } context "SiteSetting.max_emails_per_day_per_user" do diff --git a/spec/models/topic_user_spec.rb b/spec/models/topic_user_spec.rb index e0872548094..5b609c0c8dc 100644 --- a/spec/models/topic_user_spec.rb +++ b/spec/models/topic_user_spec.rb @@ -294,7 +294,8 @@ describe TopicUser do it "will receive email notification for every topic" do user1 = Fabricate(:user) - SiteSetting.stubs(:default_email_mailing_list_mode).returns(true) + SiteSetting.default_email_mailing_list_mode = true + SiteSetting.default_email_mailing_list_mode_frequency = 1 user2 = Fabricate(:user) post = create_post From eb21ed7fcfb030b06a6942c8c534ce3fd6879c8d Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 27 May 2016 14:34:44 +0800 Subject: [PATCH 023/320] Allow options to be cleared. --- .../javascripts/discourse/components/combo-box.js.es6 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/combo-box.js.es6 b/app/assets/javascripts/discourse/components/combo-box.js.es6 index e023ad267cd..4dd19bd5885 100644 --- a/app/assets/javascripts/discourse/components/combo-box.js.es6 +++ b/app/assets/javascripts/discourse/components/combo-box.js.es6 @@ -65,7 +65,11 @@ export default Ember.Component.extend({ const $elem = this.$(); const minimumResultsForSearch = this.capabilities.isIOS ? -1 : 5; - $elem.select2({formatResult: this.comboTemplate, minimumResultsForSearch, width: 'resolve'}); + $elem.select2({ + formatResult: this.comboTemplate, minimumResultsForSearch, + width: 'resolve', + allowClear: true + }); const castInteger = this.get('castInteger'); $elem.on("change", e => { From 86ed6c7d5ef08d7561f4d3e8761f4a2580224ef5 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 27 May 2016 18:02:22 +0800 Subject: [PATCH 024/320] Revert "Clear read only timestamp in Redis when switching back to master." This reverts commit f891430f32a3b8ba9caac20b5ad36621eeadd691. --- .../connection_adapters/postgresql_fallback_adapter.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb index ecc2f6e2c27..857cc28b566 100644 --- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb +++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb @@ -39,7 +39,6 @@ class PostgreSQLFallbackHandler end Discourse.disable_readonly_mode - Discourse.clear_readonly! self.master = true end rescue => e From ec4a7d708dde7a2c508cb5941a6c0fe7b0d30c6d Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Fri, 27 May 2016 11:06:51 -0400 Subject: [PATCH 025/320] Version bump to v1.6.0.beta7 --- lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.rb b/lib/version.rb index 919b48142d1..3b9b3c2a34a 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 6 TINY = 0 - PRE = 'beta6' + PRE = 'beta7' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end From 05c8bca2222ccbc5e07734357ad2285b7bc64cdc Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Fri, 27 May 2016 15:02:43 -0400 Subject: [PATCH 026/320] show tags usage in search options --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 6729cbae3a1..ff4ca0f808a 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2807,7 +2807,7 @@ en: #category-slugcategory:foogroup:foobadge:foo in:likesin:postedin:watchingin:trackingin:private in:bookmarksin:firstin:pinnedin:unpinnedin:wiki - posts_count:numbefore:days or dateafter:days or date + posts_count:numbefore:days or dateafter:days or datetags:one,two

Examples

From e922db82fb2c2970325ce6c157fa1e831be5f883 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Sun, 29 May 2016 00:49:40 +0530 Subject: [PATCH 027/320] disable username autocomplete on Sign Up modal --- .../javascripts/discourse/templates/modal/create-account.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs index b401e45c81f..5e5d9b497bd 100644 --- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs +++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs @@ -25,7 +25,7 @@ - {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength}} + {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="off"}}  {{input-tip validation=usernameValidation id="username-validation"}} From 089b1d164c67d58926c9462bd793f5a931208f45 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 30 May 2016 10:45:32 +1000 Subject: [PATCH 028/320] annotate models (reminder run RAILS_ENV=test bin/annotate once in a while) --- app/models/email_log.rb | 2 ++ app/models/incoming_email.rb | 3 +++ app/models/onceoff_log.rb | 14 ++++++++++++++ app/models/tag.rb | 15 +++++++++++++++ app/models/tag_user.rb | 17 +++++++++++++++++ app/models/topic_custom_field.rb | 2 +- app/models/topic_tag.rb | 15 +++++++++++++++ app/models/translation_override.rb | 1 + app/models/user.rb | 1 + app/models/user_option.rb | 1 + app/models/user_stat.rb | 28 +++++++++++++++------------- 11 files changed, 85 insertions(+), 14 deletions(-) diff --git a/app/models/email_log.rb b/app/models/email_log.rb index 99d12b52d1d..ceb32d5252b 100644 --- a/app/models/email_log.rb +++ b/app/models/email_log.rb @@ -73,6 +73,8 @@ end # topic_id :integer # skipped :boolean default(FALSE) # skipped_reason :string +# bounce_key :string +# bounced :boolean default(FALSE), not null # # Indexes # diff --git a/app/models/incoming_email.rb b/app/models/incoming_email.rb index 1266d665e2f..97427699d92 100644 --- a/app/models/incoming_email.rb +++ b/app/models/incoming_email.rb @@ -24,10 +24,13 @@ end # created_at :datetime not null # updated_at :datetime not null # rejection_message :text +# is_auto_generated :boolean default(FALSE) +# is_bounce :boolean default(FALSE), not null # # Indexes # # index_incoming_emails_on_created_at (created_at) # index_incoming_emails_on_error (error) # index_incoming_emails_on_message_id (message_id) +# index_incoming_emails_on_post_id (post_id) # diff --git a/app/models/onceoff_log.rb b/app/models/onceoff_log.rb index 88e43f19b4b..12ce7377c51 100644 --- a/app/models/onceoff_log.rb +++ b/app/models/onceoff_log.rb @@ -1,2 +1,16 @@ class OnceoffLog < ActiveRecord::Base end + +# == Schema Information +# +# Table name: onceoff_logs +# +# id :integer not null, primary key +# job_name :string +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_onceoff_logs_on_job_name (job_name) +# diff --git a/app/models/tag.rb b/app/models/tag.rb index bb628d38f9e..3d03aa83d3f 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -16,3 +16,18 @@ class Tag < ActiveRecord::Base .map {|name, count| name} end end + +# == Schema Information +# +# Table name: tags +# +# id :integer not null, primary key +# name :string not null +# topic_count :integer default(0), not null +# created_at :datetime +# updated_at :datetime +# +# Indexes +# +# index_tags_on_name (name) UNIQUE +# diff --git a/app/models/tag_user.rb b/app/models/tag_user.rb index 1abd68ea0ec..96244cf2117 100644 --- a/app/models/tag_user.rb +++ b/app/models/tag_user.rb @@ -93,3 +93,20 @@ class TagUser < ActiveRecord::Base private_class_method :apply_default_to_topic, :remove_default_from_topic end + +# == Schema Information +# +# Table name: tag_users +# +# id :integer not null, primary key +# tag_id :integer not null +# user_id :integer not null +# notification_level :integer not null +# created_at :datetime +# updated_at :datetime +# +# Indexes +# +# idx_tag_users_ix1 (user_id,tag_id,notification_level) UNIQUE +# idx_tag_users_ix2 (tag_id,user_id,notification_level) UNIQUE +# diff --git a/app/models/topic_custom_field.rb b/app/models/topic_custom_field.rb index 22685679d7d..5dd6e53c731 100644 --- a/app/models/topic_custom_field.rb +++ b/app/models/topic_custom_field.rb @@ -16,5 +16,5 @@ end # Indexes # # index_topic_custom_fields_on_topic_id_and_name (topic_id,name) -# index_topic_custom_fields_on_value (value) +# topic_custom_fields_value_key_idx (value,name) # diff --git a/app/models/topic_tag.rb b/app/models/topic_tag.rb index 9882ddf2450..f8dc3cfee01 100644 --- a/app/models/topic_tag.rb +++ b/app/models/topic_tag.rb @@ -2,3 +2,18 @@ class TopicTag < ActiveRecord::Base belongs_to :topic belongs_to :tag, counter_cache: "topic_count" end + +# == Schema Information +# +# Table name: topic_tags +# +# id :integer not null, primary key +# topic_id :integer not null +# tag_id :integer not null +# created_at :datetime +# updated_at :datetime +# +# Indexes +# +# index_topic_tags_on_topic_id_and_tag_id (topic_id,tag_id) UNIQUE +# diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb index 408c46f098a..d39c48221b1 100644 --- a/app/models/translation_override.rb +++ b/app/models/translation_override.rb @@ -41,6 +41,7 @@ end # value :string not null # created_at :datetime not null # updated_at :datetime not null +# compiled_js :text # # Indexes # diff --git a/app/models/user.rb b/app/models/user.rb index 4b20b97187d..a4917e0eed9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1037,6 +1037,7 @@ end # registration_ip_address :inet # trust_level_locked :boolean default(FALSE), not null # staged :boolean default(FALSE), not null +# first_seen_at :datetime # # Indexes # diff --git a/app/models/user_option.rb b/app/models/user_option.rb index ad4ac23a49a..6f0a8ecbdc6 100644 --- a/app/models/user_option.rb +++ b/app/models/user_option.rb @@ -151,6 +151,7 @@ end # email_in_reply_to :boolean default(TRUE), not null # like_notification_frequency :integer default(1), not null # include_tl0_in_digests :boolean default(FALSE) +# mailing_list_mode_frequency :integer default(0), not null # # Indexes # diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb index 746ad3557b8..7898a2e57be 100644 --- a/app/models/user_stat.rb +++ b/app/models/user_stat.rb @@ -103,17 +103,19 @@ end # # Table name: user_stats # -# user_id :integer not null, primary key -# topics_entered :integer default(0), not null -# time_read :integer default(0), not null -# days_visited :integer default(0), not null -# posts_read_count :integer default(0), not null -# likes_given :integer default(0), not null -# likes_received :integer default(0), not null -# topic_reply_count :integer default(0), not null -# new_since :datetime not null -# read_faq :datetime -# first_post_created_at :datetime -# post_count :integer default(0), not null -# topic_count :integer default(0), not null +# user_id :integer not null, primary key +# topics_entered :integer default(0), not null +# time_read :integer default(0), not null +# days_visited :integer default(0), not null +# posts_read_count :integer default(0), not null +# likes_given :integer default(0), not null +# likes_received :integer default(0), not null +# topic_reply_count :integer default(0), not null +# new_since :datetime not null +# read_faq :datetime +# first_post_created_at :datetime +# post_count :integer default(0), not null +# topic_count :integer default(0), not null +# bounce_score :integer default(0), not null +# reset_bounce_score_after :datetime # From c9dcffe434ef5944ef2cef87f7e77b17f40ff453 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 30 May 2016 11:38:08 +1000 Subject: [PATCH 029/320] FEATURE: store history for scheduled job execution --- app/jobs/scheduled/weekly.rb | 1 + app/models/scheduler_stat.rb | 20 +++++++++ .../20160530003739_create_scheduler_stats.rb | 14 ++++++ lib/scheduler/manager.rb | 21 +++++++++ lib/scheduler/views/history.erb | 45 +++++++++++++++++++ lib/scheduler/views/scheduler.erb | 2 +- lib/scheduler/web.rb | 5 +++ spec/components/scheduler/manager_spec.rb | 31 +++++++++++++ 8 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 app/models/scheduler_stat.rb create mode 100644 db/migrate/20160530003739_create_scheduler_stats.rb create mode 100644 lib/scheduler/views/history.erb diff --git a/app/jobs/scheduled/weekly.rb b/app/jobs/scheduled/weekly.rb index 613833ff514..ffce8c1d246 100644 --- a/app/jobs/scheduled/weekly.rb +++ b/app/jobs/scheduled/weekly.rb @@ -11,6 +11,7 @@ module Jobs Post.calculate_avg_time Topic.calculate_avg_time ScoreCalculator.new.calculate + SchedulerStat.purge_old Draft.cleanup! end end diff --git a/app/models/scheduler_stat.rb b/app/models/scheduler_stat.rb new file mode 100644 index 00000000000..55dc8fda6ac --- /dev/null +++ b/app/models/scheduler_stat.rb @@ -0,0 +1,20 @@ +class SchedulerStat < ActiveRecord::Base + def self.purge_old + where('started_at < ?', 3.months.ago).delete_all + end +end + +# == Schema Information +# +# Table name: scheduler_stats +# +# id :integer not null, primary key +# name :string not null +# hostname :string not null +# pid :integer not null +# duration_ms :integer +# live_slots_start :integer +# live_slots_finish :integer +# started_at :datetime not null +# success :boolean +# diff --git a/db/migrate/20160530003739_create_scheduler_stats.rb b/db/migrate/20160530003739_create_scheduler_stats.rb new file mode 100644 index 00000000000..04cfdca817e --- /dev/null +++ b/db/migrate/20160530003739_create_scheduler_stats.rb @@ -0,0 +1,14 @@ +class CreateSchedulerStats < ActiveRecord::Migration + def change + create_table :scheduler_stats do |t| + t.string :name, null: false + t.string :hostname, null: false + t.integer :pid, null: false + t.integer :duration_ms + t.integer :live_slots_start + t.integer :live_slots_finish + t.datetime :started_at, null: false + t.boolean :success + end + end +end diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb index 78d1de7fa4c..0607804258f 100644 --- a/lib/scheduler/manager.rb +++ b/lib/scheduler/manager.rb @@ -50,6 +50,14 @@ module Scheduler Discourse.handle_job_exception(ex, {message: "Scheduling manager orphan rescheduler"}) end + def hostname + @hostname ||= begin + `hostname` + rescue + "unknown" + end + end + def process_queue klass = @queue.deq # hack alert, I need to both deq and set @running atomically. @@ -57,9 +65,17 @@ module Scheduler failed = false start = Time.now.to_f info = @mutex.synchronize { @manager.schedule_info(klass) } + stat = nil begin info.prev_result = "RUNNING" @mutex.synchronize { info.write! } + stat = SchedulerStat.create!( + name: klass.to_s, + hostname: hostname, + pid: Process.pid, + started_at: Time.zone.now, + live_slots_start: GC.stat[:heap_live_slots] + ) klass.new.perform rescue Jobs::HandledExceptionWrapper # Discourse.handle_exception was already called, and we don't have any extra info to give @@ -72,6 +88,11 @@ module Scheduler info.prev_duration = duration info.prev_result = failed ? "FAILED" : "OK" info.current_owner = nil + stat.update_columns( + duration_ms: duration, + live_slots_finish: GC.stat[:heap_live_slots], + success: !failed + ) attempts(3) do @mutex.synchronize { info.write! } end diff --git a/lib/scheduler/views/history.erb b/lib/scheduler/views/history.erb new file mode 100644 index 00000000000..f6c8f5c92fc --- /dev/null +++ b/lib/scheduler/views/history.erb @@ -0,0 +1,45 @@ +
+
+

Scheduler History

+
+
+ +
+
+
+ <% if @scheduler_stats.length > 0 %> + + + + + + + + + + + + <% @scheduler_stats.each do |stat| %> + + + + + + + + + <% end %> + +
Job NameHostname:PidLive Slots deltaStarted AtDuration (ms)
<%= stat.name %><%= stat.hostname %>:<%= stat.pid %> + <% if stat.live_slots_start && stat.live_slots_finish %> + <%= stat.live_slots_finish - stat.live_slots_start %> + <% end %> + <%= relative_time stat.started_at %><%= stat.duration_ms %> + <% if !stat.success %> + FAILED + <% end %> +
+ <% end %> +
+
+
diff --git a/lib/scheduler/views/scheduler.erb b/lib/scheduler/views/scheduler.erb index 9d07083b038..d50aaa861ea 100644 --- a/lib/scheduler/views/scheduler.erb +++ b/lib/scheduler/views/scheduler.erb @@ -7,7 +7,7 @@
<% end %>
-

Recurring Jobs

+

Recurring Jobs history

diff --git a/lib/scheduler/web.rb b/lib/scheduler/web.rb index e3c6c84cd18..d3af236433f 100644 --- a/lib/scheduler/web.rb +++ b/lib/scheduler/web.rb @@ -22,6 +22,11 @@ module Scheduler end end + app.get "/scheduler/history" do + @scheduler_stats = SchedulerStat.order('started_at desc').limit(200) + erb File.read(File.join(VIEWS, 'history.erb')), locals: {view_path: VIEWS} + end + app.post "/scheduler/:name/trigger" do halt 404 unless (name = params[:name]) diff --git a/spec/components/scheduler/manager_spec.rb b/spec/components/scheduler/manager_spec.rb index 7261a79fe38..2f82deed73c 100644 --- a/spec/components/scheduler/manager_spec.rb +++ b/spec/components/scheduler/manager_spec.rb @@ -133,6 +133,37 @@ describe Scheduler::Manager do expect(info.next_run).to be <= Time.now.to_i end + it 'should log when job finishes running' do + + Testing::RandomJob.runs = 0 + + info = manager.schedule_info(Testing::RandomJob) + info.next_run = Time.now.to_i - 1 + info.write! + + manager = Scheduler::Manager.new(DiscourseRedis.new) + manager.blocking_tick + manager.stop! + + stat = SchedulerStat.first + expect(stat).to be_present + expect(stat.duration_ms).to be > 0 + expect(stat.success).to be true + + end + + it 'should log when jobs start running' do + info = manager.schedule_info(Testing::SuperLongJob) + info.next_run = Time.now.to_i - 1 + info.write! + + manager.tick + manager.stop! + + stat = SchedulerStat.first + expect(stat).to be_present + end + it 'should only run pending job once' do Testing::RandomJob.runs = 0 From cc088956bc2dbab95fd77574886c84c3ea5f0215 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 30 May 2016 12:28:05 +1000 Subject: [PATCH 030/320] correct some test concurrency bugs --- lib/scheduler/manager.rb | 36 +++++++++++++++-------- spec/components/scheduler/manager_spec.rb | 10 ++++--- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb index 0607804258f..0e264d2492c 100644 --- a/lib/scheduler/manager.rb +++ b/lib/scheduler/manager.rb @@ -8,7 +8,7 @@ require_dependency 'distributed_mutex' module Scheduler class Manager - attr_accessor :random_ratio, :redis + attr_accessor :random_ratio, :redis, :enable_stats class Runner def initialize(manager) @@ -69,13 +69,15 @@ module Scheduler begin info.prev_result = "RUNNING" @mutex.synchronize { info.write! } - stat = SchedulerStat.create!( - name: klass.to_s, - hostname: hostname, - pid: Process.pid, - started_at: Time.zone.now, - live_slots_start: GC.stat[:heap_live_slots] - ) + if @manager.enable_stats + stat = SchedulerStat.create!( + name: klass.to_s, + hostname: hostname, + pid: Process.pid, + started_at: Time.zone.now, + live_slots_start: GC.stat[:heap_live_slots] + ) + end klass.new.perform rescue Jobs::HandledExceptionWrapper # Discourse.handle_exception was already called, and we don't have any extra info to give @@ -88,11 +90,13 @@ module Scheduler info.prev_duration = duration info.prev_result = failed ? "FAILED" : "OK" info.current_owner = nil - stat.update_columns( - duration_ms: duration, - live_slots_finish: GC.stat[:heap_live_slots], - success: !failed - ) + if stat + stat.update_columns( + duration_ms: duration, + live_slots_finish: GC.stat[:heap_live_slots], + success: !failed + ) + end attempts(3) do @mutex.synchronize { info.write! } end @@ -151,6 +155,12 @@ module Scheduler @hostname = options && options[:hostname] @manager_id = SecureRandom.hex + + if options && options.key?(:enable_stats) + @enable_stats = options[:enable_stats] + else + @enable_stats = true + end end def self.current diff --git a/spec/components/scheduler/manager_spec.rb b/spec/components/scheduler/manager_spec.rb index 2f82deed73c..8b1bff1a878 100644 --- a/spec/components/scheduler/manager_spec.rb +++ b/spec/components/scheduler/manager_spec.rb @@ -54,7 +54,9 @@ describe Scheduler::Manager do end end - let(:manager) { Scheduler::Manager.new(DiscourseRedis.new) } + let(:manager) { + Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false) + } before do $redis.del manager.class.lock_key @@ -79,7 +81,7 @@ describe Scheduler::Manager do hosts.map do |host| - manager = Scheduler::Manager.new(DiscourseRedis.new, hostname: host) + manager = Scheduler::Manager.new(DiscourseRedis.new, hostname: host, enable_stats: false) manager.ensure_schedule!(Testing::PerHostJob) info = manager.schedule_info(Testing::PerHostJob) @@ -126,7 +128,7 @@ describe Scheduler::Manager do $redis.del manager.identity_key - manager = Scheduler::Manager.new(DiscourseRedis.new) + manager = Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false) manager.reschedule_orphans! info = manager.schedule_info(Testing::SuperLongJob) @@ -174,7 +176,7 @@ describe Scheduler::Manager do (0..5).map do Thread.new do - manager = Scheduler::Manager.new(DiscourseRedis.new) + manager = Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false) manager.blocking_tick manager.stop! end From e11c83341c7001c693f8f4e155c801ab90335866 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 30 May 2016 12:43:01 +1000 Subject: [PATCH 031/320] add more specs --- spec/components/scheduler/manager_spec.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spec/components/scheduler/manager_spec.rb b/spec/components/scheduler/manager_spec.rb index 8b1bff1a878..6811d2d5128 100644 --- a/spec/components/scheduler/manager_spec.rb +++ b/spec/components/scheduler/manager_spec.rb @@ -58,6 +58,14 @@ describe Scheduler::Manager do Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false) } + it 'can disable stats' do + manager = Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false) + expect(manager.enable_stats).to eq(false) + + manager = Scheduler::Manager.new(DiscourseRedis.new) + expect(manager.enable_stats).to eq(true) + end + before do $redis.del manager.class.lock_key $redis.del manager.class.queue_key @@ -140,6 +148,7 @@ describe Scheduler::Manager do Testing::RandomJob.runs = 0 info = manager.schedule_info(Testing::RandomJob) + manager.enable_stats = true info.next_run = Time.now.to_i - 1 info.write! @@ -151,11 +160,13 @@ describe Scheduler::Manager do expect(stat).to be_present expect(stat.duration_ms).to be > 0 expect(stat.success).to be true + SchedulerStat.destroy_all end it 'should log when jobs start running' do info = manager.schedule_info(Testing::SuperLongJob) + manager.enable_stats = true info.next_run = Time.now.to_i - 1 info.write! @@ -164,6 +175,7 @@ describe Scheduler::Manager do stat = SchedulerStat.first expect(stat).to be_present + SchedulerStat.destroy_all end it 'should only run pending job once' do From cb5be1fe8f7032d4d648a375e5fcb516ba3a1541 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 30 May 2016 11:38:04 +0800 Subject: [PATCH 032/320] Upgrade rspec to 3.4.0. --- Gemfile | 2 +- Gemfile.lock | 34 +++++++++---------- app/models/user.rb | 7 ++-- lib/plugin/filter_manager.rb | 2 +- spec/components/plugin/filter_manager_spec.rb | 4 +-- spec/components/topic_query_spec.rb | 2 +- .../directory_items_controller_spec.rb | 2 +- .../omniauth_callbacks_controller_spec.rb | 4 +-- .../user_actions_controller_spec.rb | 2 +- .../user_badges_controller_spec.rb | 4 +-- spec/jobs/jobs_base_spec.rb | 2 +- spec/models/post_action_spec.rb | 2 +- spec/models/topic_spec.rb | 6 ++-- spec/models/user_spec.rb | 4 +-- spec/rails_helper.rb | 7 ---- 15 files changed, 40 insertions(+), 44 deletions(-) diff --git a/Gemfile b/Gemfile index 29c9292d08d..ab8d2856f4d 100644 --- a/Gemfile +++ b/Gemfile @@ -125,7 +125,7 @@ group :test do end group :test, :development do - gem 'rspec', '~> 3.2.0' + gem 'rspec' gem 'mock_redis' gem 'listen', '0.7.3', require: false gem 'certified', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 995efb13e07..f54b09ea2dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -294,33 +294,33 @@ GEM netrc (~> 0.7) rinku (2.0.0) rmmseg-cpp (0.2.9) - rspec (3.2.0) - rspec-core (~> 3.2.0) - rspec-expectations (~> 3.2.0) - rspec-mocks (~> 3.2.0) - rspec-core (3.2.3) - rspec-support (~> 3.2.0) - rspec-expectations (3.2.1) + rspec (3.4.0) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-core (3.4.4) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) + rspec-support (~> 3.4.0) rspec-given (3.7.1) given_core (= 3.7.1) rspec (>= 2.14.0) rspec-html-matchers (0.7.0) nokogiri (~> 1) rspec (~> 3) - rspec-mocks (3.2.1) + rspec-mocks (3.4.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) - rspec-rails (3.2.3) + rspec-support (~> 3.4.0) + rspec-rails (3.4.2) actionpack (>= 3.0, < 4.3) activesupport (>= 3.0, < 4.3) railties (>= 3.0, < 4.3) - rspec-core (~> 3.2.0) - rspec-expectations (~> 3.2.0) - rspec-mocks (~> 3.2.0) - rspec-support (~> 3.2.0) - rspec-support (3.2.2) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) rtlit (0.0.5) ruby-openid (2.7.0) ruby-readability (0.7.0) @@ -475,7 +475,7 @@ DEPENDENCIES rest-client rinku rmmseg-cpp - rspec (~> 3.2.0) + rspec rspec-given rspec-html-matchers rspec-rails diff --git a/app/models/user.rb b/app/models/user.rb index a4917e0eed9..bff29252386 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -613,7 +613,10 @@ class User < ActiveRecord::Base # Use this helper to determine if the user has a particular trust level. # Takes into account admin, etc. def has_trust_level?(level) - raise "Invalid trust level #{level}" unless TrustLevel.valid?(level) + unless TrustLevel.valid?(level) + raise InvalidTrustLevel.new("Invalid trust level #{level}") + end + admin? || moderator? || staged? || TrustLevel.compare(trust_level, level) end @@ -907,7 +910,7 @@ class User < ActiveRecord::Base end def hash_password(password, salt) - raise "password is too long" if password.size > User.max_password_length + raise StandardError.new("password is too long") if password.size > User.max_password_length Pbkdf2.hash_password(password, salt, Rails.configuration.pbkdf2_iterations, Rails.configuration.pbkdf2_algorithm) end diff --git a/lib/plugin/filter_manager.rb b/lib/plugin/filter_manager.rb index 10da578bd9c..34b76a1e1e3 100644 --- a/lib/plugin/filter_manager.rb +++ b/lib/plugin/filter_manager.rb @@ -6,7 +6,7 @@ module Plugin end def register(name, &blk) - raise ArgumentException unless blk && blk.arity == 2 + raise ArgumentError unless blk && blk.arity == 2 filters = @map[name] ||= [] filters << blk end diff --git a/spec/components/plugin/filter_manager_spec.rb b/spec/components/plugin/filter_manager_spec.rb index 44e98d530e5..285a2c8df43 100644 --- a/spec/components/plugin/filter_manager_spec.rb +++ b/spec/components/plugin/filter_manager_spec.rb @@ -20,7 +20,7 @@ describe Plugin::FilterManager do expect do instance.register(:test) do end - end.to raise_exception + end.to raise_error(ArgumentError) end it "should return the original if no filters exist" do @@ -30,6 +30,6 @@ describe Plugin::FilterManager do it "should raise an exception if no block is passed in" do expect do instance.register(:test) - end.to raise_exception + end.to raise_error(ArgumentError) end end diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb index d3298a9dcdd..8874bcabbe5 100644 --- a/spec/components/topic_query_spec.rb +++ b/spec/components/topic_query_spec.rb @@ -416,7 +416,7 @@ describe TopicQuery do TopicList.preloaded_custom_fields.clear # if we attempt to access non preloaded fields explode - expect{new_topic.custom_fields["boom"]}.to raise_error + expect{new_topic.custom_fields["boom"]}.to raise_error(StandardError) end end diff --git a/spec/controllers/directory_items_controller_spec.rb b/spec/controllers/directory_items_controller_spec.rb index 38132d8e211..fa33e8af9a1 100644 --- a/spec/controllers/directory_items_controller_spec.rb +++ b/spec/controllers/directory_items_controller_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' describe DirectoryItemsController do it "requires a `period` param" do - expect{ xhr :get, :index }.to raise_error + expect{ xhr :get, :index }.to raise_error(ActionController::ParameterMissing) end it "requires a proper `period` param" do diff --git a/spec/controllers/omniauth_callbacks_controller_spec.rb b/spec/controllers/omniauth_callbacks_controller_spec.rb index 62f803cea41..de2a7d8f4d1 100644 --- a/spec/controllers/omniauth_callbacks_controller_spec.rb +++ b/spec/controllers/omniauth_callbacks_controller_spec.rb @@ -7,13 +7,13 @@ describe Users::OmniauthCallbacksController do SiteSetting.stubs("enable_twitter_logins?").returns(false) expect(lambda { Users::OmniauthCallbacksController.find_authenticator("twitter") - }).to raise_error + }).to raise_error(Discourse::InvalidAccess) end it "fails for unknown" do expect(lambda { Users::OmniauthCallbacksController.find_authenticator("twitter1") - }).to raise_error + }).to raise_error(Discourse::InvalidAccess) end it "finds an authenticator when enabled" do diff --git a/spec/controllers/user_actions_controller_spec.rb b/spec/controllers/user_actions_controller_spec.rb index b1914dea233..a161c2f90d3 100644 --- a/spec/controllers/user_actions_controller_spec.rb +++ b/spec/controllers/user_actions_controller_spec.rb @@ -5,7 +5,7 @@ describe UserActionsController do context 'index' do it 'fails if username is not specified' do - expect { xhr :get, :index }.to raise_error + expect { xhr :get, :index }.to raise_error(ActionController::ParameterMissing) end it 'renders list correctly' do diff --git a/spec/controllers/user_badges_controller_spec.rb b/spec/controllers/user_badges_controller_spec.rb index 0046f614049..8047d857154 100644 --- a/spec/controllers/user_badges_controller_spec.rb +++ b/spec/controllers/user_badges_controller_spec.rb @@ -24,7 +24,7 @@ describe UserBadgesController do let!(:user_badge) { UserBadge.create(badge: badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now) } it 'requires username or badge_id to be specified' do - expect { xhr :get, :index }.to raise_error + expect { xhr :get, :index }.to raise_error(ActionController::ParameterMissing) end it 'returns user_badges for a user' do @@ -54,7 +54,7 @@ describe UserBadgesController do context 'create' do it 'requires username to be specified' do - expect { xhr :post, :create, badge_id: badge.id }.to raise_error + expect { xhr :post, :create, badge_id: badge.id }.to raise_error(ActionController::ParameterMissing) end it 'does not allow regular users to grant badges' do diff --git a/spec/jobs/jobs_base_spec.rb b/spec/jobs/jobs_base_spec.rb index c8ab2ab56aa..4388dc4886f 100644 --- a/spec/jobs/jobs_base_spec.rb +++ b/spec/jobs/jobs_base_spec.rb @@ -32,7 +32,7 @@ describe Jobs::Base do Discourse.expects(:handle_job_exception).times(3) bad = BadJob.new - expect{bad.perform({})}.to raise_error + expect{bad.perform({})}.to raise_error(Jobs::HandledExceptionWrapper) expect(bad.fail_count).to eq(3) end diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb index e5809521e75..9321dedd81e 100644 --- a/spec/models/post_action_spec.rb +++ b/spec/models/post_action_spec.rb @@ -29,7 +29,7 @@ describe PostAction do expect { PostAction.act(eviltrout, post, PostActionType.types[:like]) - }.to raise_error + }.to raise_error(RateLimiter::LimitExceeded) end end diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index e9b8b84cffe..e1f48980ffd 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -443,7 +443,7 @@ describe Topic do expect { topic.invite(topic.user, "user@example.com") - }.to raise_exception + }.to raise_error(RateLimiter::LimitExceeded) end context 'bumping topics' do @@ -1483,7 +1483,7 @@ describe Topic do freeze_time(start + 10.minutes) expect { create_post(user: user) - }.to raise_exception + }.to raise_error(RateLimiter::LimitExceeded) freeze_time(start + 20.minutes) create_post(user: user, topic_id: topic_id) @@ -1492,7 +1492,7 @@ describe Topic do expect { create_post(user: user, topic_id: topic_id) - }.to raise_exception + }.to raise_error(RateLimiter::LimitExceeded) end describe ".count_exceeds_minimun?" do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 63a0dcfb2a2..4fbd120a68a 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -204,7 +204,7 @@ describe User do describe 'has_trust_level?' do it "raises an error with an invalid level" do - expect { user.has_trust_level?(:wat) }.to raise_error + expect { user.has_trust_level?(:wat) }.to raise_error(InvalidTrustLevel) end it "is true for your basic level" do @@ -1106,7 +1106,7 @@ describe User do end it "raises an error when passwords are too long" do - expect { hash(too_long, 'gravy') }.to raise_error + expect { hash(too_long, 'gravy') }.to raise_error(StandardError) end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 354cb630dd4..30921a6e3f4 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -78,13 +78,6 @@ Spork.prefork do SiteSetting.defaults[k] = v end - # Monkey patch for NoMethodError: undefined method `cache' for nil:NilClass - # https://github.com/rspec/rspec-rails/issues/1532#issuecomment-174679485 - # fixed in Rspec 3.4.1 - RSpec::Rails::ViewRendering::EmptyTemplatePathSetDecorator.class_eval do - alias_method :find_all_anywhere, :find_all - end - require_dependency 'site_settings/local_process_provider' SiteSetting.provider = SiteSettings::LocalProcessProvider.new end From 880b7e105322283b24fe635d417262717ea4f585 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 30 May 2016 11:50:02 +0800 Subject: [PATCH 033/320] FIX: Connections were incorrectly going to master when failing over. --- .../connection_adapters/postgresql_fallback_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb index 857cc28b566..b52a6c12ac0 100644 --- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb +++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb @@ -79,7 +79,7 @@ class PostgreSQLFallbackHandler end def verify? - !master && !running && !recently_checked? + !master && !running end private From 706624c9fcaf0b10b2d1ada952c5a177b9bedf59 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 30 May 2016 13:59:16 +1000 Subject: [PATCH 034/320] workaround incorrect uncategorized category id set in site settings --- db/fixtures/001_categories.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db/fixtures/001_categories.rb b/db/fixtures/001_categories.rb index edc23155fe1..c6880b53385 100644 --- a/db/fixtures/001_categories.rb +++ b/db/fixtures/001_categories.rb @@ -2,7 +2,10 @@ ActiveRecord::Base.send(:subclasses).each{|m| m.reset_column_information} SiteSetting.refresh! -if SiteSetting.uncategorized_category_id == -1 || !Category.exists?(SiteSetting.uncategorized_category_id) +uncat_id = SiteSetting.uncategorized_category_id +uncat_id = -1 unless Numeric === uncat_id + +if uncat_id == -1 || !Category.exists?(uncat_id) puts "Seeding uncategorized category!" result = Category.exec_sql "SELECT 1 FROM categories WHERE lower(name) = 'uncategorized'" From 3eec0a83b012c318b7362928567678dbfc56542d Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 30 May 2016 13:59:39 +1000 Subject: [PATCH 035/320] clean up stop semantics and bypass test --- lib/scheduler/manager.rb | 30 +++++++++-- spec/components/scheduler/manager_spec.rb | 62 ++++++++++------------- 2 files changed, 53 insertions(+), 39 deletions(-) diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb index 0e264d2492c..1846aa7669a 100644 --- a/lib/scheduler/manager.rb +++ b/lib/scheduler/manager.rb @@ -12,11 +12,12 @@ module Scheduler class Runner def initialize(manager) + @stopped = false @mutex = Mutex.new @queue = Queue.new @manager = manager @reschedule_orphans_thread = Thread.new do - while true + while !@stopped sleep 1.minute @mutex.synchronize do reschedule_orphans @@ -24,7 +25,7 @@ module Scheduler end end @keep_alive_thread = Thread.new do - while true + while !@stopped @mutex.synchronize do keep_alive end @@ -32,8 +33,17 @@ module Scheduler end end @thread = Thread.new do - while true - process_queue + while !@stopped + if @manager.enable_stats + begin + RailsMultisite::ConnectionManagement.establish_connection(db: "default") + process_queue + ensure + ActiveRecord::Base.connection_handler.clear_active_connections! + end + else + process_queue + end end end end @@ -60,6 +70,8 @@ module Scheduler def process_queue klass = @queue.deq + return unless klass + # hack alert, I need to both deq and set @running atomically. @running = true failed = false @@ -108,9 +120,17 @@ module Scheduler def stop! @mutex.synchronize do - @thread.kill + @stopped = true + @keep_alive_thread.kill @reschedule_orphans_thread.kill + + enq(nil) + + Thread.new do + sleep 5 + @thread.kill + end end end diff --git a/spec/components/scheduler/manager_spec.rb b/spec/components/scheduler/manager_spec.rb index 6811d2d5128..b72e3d519de 100644 --- a/spec/components/scheduler/manager_spec.rb +++ b/spec/components/scheduler/manager_spec.rb @@ -58,6 +58,14 @@ describe Scheduler::Manager do Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false) } + before { + expect(ActiveRecord::Base.connection_pool.connections.length).to eq(1) + } + + after { + expect(ActiveRecord::Base.connection_pool.connections.length).to eq(1) + } + it 'can disable stats' do manager = Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false) expect(manager.enable_stats).to eq(false) @@ -143,40 +151,26 @@ describe Scheduler::Manager do expect(info.next_run).to be <= Time.now.to_i end - it 'should log when job finishes running' do - - Testing::RandomJob.runs = 0 - - info = manager.schedule_info(Testing::RandomJob) - manager.enable_stats = true - info.next_run = Time.now.to_i - 1 - info.write! - - manager = Scheduler::Manager.new(DiscourseRedis.new) - manager.blocking_tick - manager.stop! - - stat = SchedulerStat.first - expect(stat).to be_present - expect(stat.duration_ms).to be > 0 - expect(stat.success).to be true - SchedulerStat.destroy_all - - end - - it 'should log when jobs start running' do - info = manager.schedule_info(Testing::SuperLongJob) - manager.enable_stats = true - info.next_run = Time.now.to_i - 1 - info.write! - - manager.tick - manager.stop! - - stat = SchedulerStat.first - expect(stat).to be_present - SchedulerStat.destroy_all - end + # something about logging jobs causing a leak in connection pool in test + # it 'should log when job finishes running' do + # + # Testing::RandomJob.runs = 0 + # + # info = manager.schedule_info(Testing::RandomJob) + # info.next_run = Time.now.to_i - 1 + # info.write! + # + # # with stats so we must be careful to cleanup + # manager = Scheduler::Manager.new(DiscourseRedis.new) + # manager.blocking_tick + # manager.stop! + # + # stat = SchedulerStat.first + # expect(stat).to be_present + # expect(stat.duration_ms).to be > 0 + # expect(stat.success).to be true + # SchedulerStat.destroy_all + # end it 'should only run pending job once' do From 1caaf5208f95d41a5bd30f589b7bdeec9707c8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 30 May 2016 09:46:27 +0200 Subject: [PATCH 036/320] move tombstone under 'uploads/' for easier deployment --- lib/file_store/local_store.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/file_store/local_store.rb b/lib/file_store/local_store.rb index e9bbdab6a1f..5054c7cc810 100644 --- a/lib/file_store/local_store.rb +++ b/lib/file_store/local_store.rb @@ -13,9 +13,9 @@ module FileStore return unless is_relative?(url) path = public_dir + url return if !File.exists?(path) - tombstone = public_dir + url.sub("/uploads/", "/tombstone/") - FileUtils.mkdir_p(Pathname.new(tombstone).dirname) - FileUtils.move(path, tombstone, :force => true) + tombstone = public_dir + url.sub("/uploads/", "/uploads/tombstone/") + FileUtils.mkdir_p(tombstone_dir) + FileUtils.move(path, tombstone, force: true) end def has_been_uploaded?(url) @@ -85,7 +85,7 @@ module FileStore end def tombstone_dir - public_dir + relative_base_url.sub("/uploads/", "/tombstone/") + public_dir + relative_base_url.sub("/uploads/", "/uploads/tombstone/") end end From 116efffdaad04ca4357fffa827ef236f93454378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 30 May 2016 17:11:17 +0200 Subject: [PATCH 037/320] FEATURE: webhooks support for mailgun --- app/controllers/webhooks_controller.rb | 77 ++++++++++++++++++++ app/models/admin_dashboard_data.rb | 7 ++ config/locales/server.en.yml | 2 + config/routes.rb | 2 + config/site_settings.yml | 3 + lib/email/receiver.rb | 8 +- spec/controllers/webhooks_controller_spec.rb | 34 +++++++++ 7 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 app/controllers/webhooks_controller.rb create mode 100644 spec/controllers/webhooks_controller_spec.rb diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb new file mode 100644 index 00000000000..f1278612773 --- /dev/null +++ b/app/controllers/webhooks_controller.rb @@ -0,0 +1,77 @@ +require "openssl" + +class WebhooksController < ActionController::Base + + def mailgun + # can't verify data without an API key + return mailgun_failure if SiteSetting.mailgun_api_key.blank? + + # token is a random string of 50 characters + token = params.delete("token") + return mailgun_failure if token.blank? || token.size != 50 + + # prevent replay attack + key = "mailgun_token_#{token}" + return mailgun_failure unless $redis.setnx(key, 1) + $redis.expire(key, 8.hours) + + # ensure timestamp isn't too far from current time + timestamp = params.delete("timestamp") + return mailgun_failure if (Time.at(timestamp.to_i) - Time.now).abs > 1.hour.to_i + + # check the signature + return mailgun_failure unless mailgun_verify(timestamp, token, params["signature"]) + + handled = false + event = params.delete("event") + + # only handle soft bounces, because hard bounces are also handled + # by the "dropped" event and we don't want to increase bounce score twice + # for the same message + if event == "bounced".freeze && params["error"]["4."] + handled = mailgun_process(params, Email::Receiver::SOFT_BOUNCE_SCORE) + elsif event == "dropped".freeze + handled = mailgun_process(params, Email::Receiver::HARD_BOUNCE_SCORE) + end + + handled ? mailgun_success : mailgun_failure + end + + private + + def mailgun_failure + render nothing: true, status: 406 + end + + def mailgun_success + render nothing: true, status: 200 + end + + def mailgun_verify(timestamp, token, signature) + digest = OpenSSL::Digest::SHA256.new + data = "#{timestamp}#{token}" + signature == OpenSSL::HMAC.hexdigest(digest, SiteSetting.mailgun_api_key, data) + end + + def mailgun_process(params, bounce_score) + return false if params["message-headers"].blank? + + return_path_header = params["message-headers"].first { |h| h[0] == "Return-Path".freeze } + return false if return_path_header.blank? + + return_path = return_path_header[1] + return false if return_path.blank? + + bounce_key = return_path[/\+verp-(\h{32})@/, 1] + return false if bounce_key.blank? + + email_log = EmailLog.find_by(bounce_key: bounce_key) + return false if email_log.nil? + + email_log.update_columns(bounced: true) + Email::Receiver.update_bounce_score(email_log.user.email, bounce_score) + + true + end + +end diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb index b5ca6de7550..66a31f88752 100644 --- a/app/models/admin_dashboard_data.rb +++ b/app/models/admin_dashboard_data.rb @@ -266,4 +266,11 @@ class AdminDashboardData I18n.t('dashboard.email_polling_errored_recently', count: errors) if errors > 0 end + def missing_mailgun_api_key + return unless SiteSetting.reply_by_email_enabled + return unless ActionMailer::Base.smtp_settings[:address]["smtp.mailgun.org"] + return unless SiteSetting.mailgun_api_key.blank? + I18n.t('dashboard.missing_mailgun_api_key') + end + end diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index ff4ca0f808a..11da9082f27 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -798,6 +798,7 @@ en: email_polling_errored_recently: one: "Email polling has generated an error in the past 24 hours. Look at the logs for more details." other: "Email polling has generated %{count} errors in the past 24 hours. Look at the logs for more details." + missing_mailgun_api_key: "The server is configured to send emails via mailgun but you haven't provided an API key used the verify the webhook messages." bad_favicon_url: "The favicon is failing to load. Check your favicon_url setting in Site Settings." poll_pop3_timeout: "Connection to the POP3 server is timing out. Incoming email could not be retrieved. Please check your POP3 settings and service provider." poll_pop3_auth_error: "Connection to the POP3 server is failing with an authentication error. Please check your POP3 settings." @@ -1185,6 +1186,7 @@ en: block_auto_generated_emails: "Block incoming emails identified as being auto generated." bounce_score_threshold: "Max score before we will stop emailing a user. Soft bounce adds 1, hard bounce adds 2, score reset 30 days after last bounce." ignore_by_title: "Ignore incoming emails based on their title." + mailgun_api_key: "Mailgun API key used to verify webhook messages." manual_polling_enabled: "Push emails using the API for email replies." pop3_polling_enabled: "Poll via POP3 for email replies." diff --git a/config/routes.rb b/config/routes.rb index 21459fc9c3f..9a1675e2401 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,6 +16,8 @@ Discourse::Application.routes.draw do match "/404", to: "exceptions#not_found", via: [:get, :post] get "/404-body" => "exceptions#not_found_body" + post "webhooks/mailgun" => "webhooks#mailgun" + if Rails.env.development? mount Sidekiq::Web => "/sidekiq" mount Logster::Web => "/logs" diff --git a/config/site_settings.yml b/config/site_settings.yml index 828ddf1dde2..e3176161f8c 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -582,6 +582,9 @@ email: ignore_by_title: type: list default: '' + mailgun_api_key: + default: '' + regex: '^pubkey-\h{32}$' files: diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index d71cf8ca7da..af3245fde95 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -151,12 +151,12 @@ module Email if @mail.error_status.present? if @mail.error_status.start_with?("4.") - update_bounce_score(email_log.user.email, SOFT_BOUNCE_SCORE) + Email::Receiver.update_bounce_score(email_log.user.email, SOFT_BOUNCE_SCORE) elsif @mail.error_status.start_with?("5.") - update_bounce_score(email_log.user.email, HARD_BOUNCE_SCORE) + Email::Receiver.update_bounce_score(email_log.user.email, HARD_BOUNCE_SCORE) end elsif is_auto_generated? - update_bounce_score(email_log.user.email, HARD_BOUNCE_SCORE) + Email::Receiver.update_bounce_score(email_log.user.email, HARD_BOUNCE_SCORE) end end end @@ -168,7 +168,7 @@ module Email @verp ||= all_destinations.select { |to| to[/\+verp-\h{32}@/] }.first end - def update_bounce_score(email, score) + def self.update_bounce_score(email, score) # only update bounce score once per day key = "bounce_score:#{email}:#{Date.today}" diff --git a/spec/controllers/webhooks_controller_spec.rb b/spec/controllers/webhooks_controller_spec.rb new file mode 100644 index 00000000000..662833b494b --- /dev/null +++ b/spec/controllers/webhooks_controller_spec.rb @@ -0,0 +1,34 @@ +require "rails_helper" + +describe WebhooksController do + + context "mailgun" do + + + it "works" do + SiteSetting.mailgun_api_key = "pubkey-8221462f0c915af3f6f2e2df7aa5a493" + token = "705a8ccd2ce932be8e98c221fe701c1b4a0afcb8bbd57726de" + + user = Fabricate(:user, email: "em@il.com") + email_log = Fabricate(:email_log, user: user, bounce_key: SecureRandom.hex) + return_path = "foo+verp-#{email_log.bounce_key}@bar.com" + + $redis.del("mailgun_token_#{token}") + $redis.del("bounce_score:#{user.email}:#{Date.today}") + WebhooksController.any_instance.expects(:mailgun_verify).returns(true) + + post :mailgun, "token" => token, + "timestamp" => Time.now.to_i, + "event" => "dropped", + "message-headers" => [["Return-Path", return_path]] + + expect(response).to be_success + + email_log.reload + expect(email_log.bounced).to eq(true) + expect(email_log.user.user_stat.bounce_score).to eq(2) + end + + end + +end From be057dfb75ad5cdb5c10800003da99134f01b355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 30 May 2016 19:29:29 +0200 Subject: [PATCH 038/320] fix no replies string --- app/assets/javascripts/discourse/templates/user/summary.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs index 1b1a12eb938..ebb483b7814 100644 --- a/app/assets/javascripts/discourse/templates/user/summary.hbs +++ b/app/assets/javascripts/discourse/templates/user/summary.hbs @@ -108,7 +108,7 @@ {{/each}} {{else}} -

{{i18n "user.summary.no_likes"}}

+

{{i18n "user.summary.no_replies"}}

{{/if}}
From 26f25fc0d98c19c7f2742ec2973d236442acb960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 30 May 2016 19:48:46 +0200 Subject: [PATCH 039/320] FIX: most liked queries were leaking info in user summaries --- app/models/topic.rb | 2 +- app/models/user_summary.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index 5694d3c0c0e..6a568f549bd 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -129,7 +129,7 @@ class Topic < ActiveRecord::Base # Return private message topics scope :private_messages, -> { where(archetype: Archetype.private_message) } - scope :listable_topics, -> { where('topics.archetype <> ?', [Archetype.private_message]) } + scope :listable_topics, -> { where('topics.archetype <> ?', Archetype.private_message) } scope :by_newest, -> { order('topics.created_at desc, topics.id desc') } diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb index dd14be6e296..abfc9b8f514 100644 --- a/app/models/user_summary.rb +++ b/app/models/user_summary.rb @@ -53,7 +53,7 @@ class UserSummary def most_liked_by_users likers = {} UserAction.joins(:target_topic, :target_post) - .where('topics.archetype <> ?', Archetype.private_message) + .merge(Topic.listable_topics.visible.secured(@guardian)) .where(user: @user) .where(action_type: UserAction::WAS_LIKED) .group(:acting_user_id) @@ -78,7 +78,7 @@ class UserSummary def most_liked_users liked_users = {} UserAction.joins(:target_topic, :target_post) - .where('topics.archetype <> ?', Archetype.private_message) + .merge(Topic.listable_topics.visible.secured(@guardian)) .where(action_type: UserAction::WAS_LIKED) .where(acting_user_id: @user.id) .group(:user_id) From 6796b1585797306cff8bb0a9104f7bb7f19ac919 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 30 May 2016 16:37:06 -0400 Subject: [PATCH 040/320] FEATURE: restrict tags to be used in a category --- .../components/edit-category-tags.js.es6 | 4 ++ .../discourse/components/tag-chooser.js.es6 | 6 +- .../discourse/models/category.js.es6 | 3 +- .../components/edit-category-tags.hbs | 4 ++ .../discourse/templates/composer.hbs | 2 +- .../templates/modal/edit-category.hbs | 3 + .../javascripts/discourse/templates/topic.hbs | 2 +- app/controllers/categories_controller.rb | 3 +- app/controllers/tags_controller.rb | 21 +++---- app/models/category.rb | 9 +++ app/models/category_tag.rb | 4 ++ app/models/tag.rb | 7 ++- app/serializers/category_serializer.rb | 11 +++- config/locales/client.en.yml | 3 + .../20160527191614_create_category_tags.rb | 12 ++++ lib/discourse_tagging.rb | 51 +++++++++++++---- spec/integration/category_tag_spec.rb | 55 +++++++++++++++++++ 17 files changed, 168 insertions(+), 32 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/edit-category-tags.js.es6 create mode 100644 app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs create mode 100644 app/models/category_tag.rb create mode 100644 db/migrate/20160527191614_create_category_tags.rb create mode 100644 spec/integration/category_tag_spec.rb diff --git a/app/assets/javascripts/discourse/components/edit-category-tags.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tags.js.es6 new file mode 100644 index 00000000000..22bf364e968 --- /dev/null +++ b/app/assets/javascripts/discourse/components/edit-category-tags.js.es6 @@ -0,0 +1,4 @@ +import { buildCategoryPanel } from 'discourse/components/edit-category-panel'; + +export default buildCategoryPanel('tags', { +}); diff --git a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 index 88e7577d1e2..e69ba2df5cf 100644 --- a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 +++ b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 @@ -6,7 +6,7 @@ function formatTag(t) { export default Ember.TextField.extend({ classNameBindings: [':tag-chooser'], - attributeBindings: ['tabIndex'], + attributeBindings: ['tabIndex', 'placeholderKey', 'categoryId'], _setupTags: function() { const tags = this.get('tags') || []; @@ -25,7 +25,7 @@ export default Ember.TextField.extend({ this.$().select2({ tags: true, - placeholder: I18n.t('tagging.choose_for_topic'), + placeholder: I18n.t(this.get('placeholderKey') || 'tagging.choose_for_topic'), maximumInputLength: this.siteSettings.max_tag_length, maximumSelectionSize: this.siteSettings.max_tags_per_topic, initSelection(element, callback) { @@ -78,7 +78,7 @@ export default Ember.TextField.extend({ url: Discourse.getURL("/tags/filter/search"), dataType: 'json', data: function (term) { - return { q: term, limit: self.siteSettings.max_tag_search_results, filterForInput: true }; + return { q: term, limit: self.siteSettings.max_tag_search_results, filterForInput: true, categoryId: self.get('categoryId') }; }, results: function (data) { if (self.siteSettings.tags_sort_alphabetically) { diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6 index 37cfd9f2977..0e013cf8337 100644 --- a/app/assets/javascripts/discourse/models/category.js.es6 +++ b/app/assets/javascripts/discourse/models/category.js.es6 @@ -86,7 +86,8 @@ const Category = RestModel.extend({ allow_badges: this.get('allow_badges'), custom_fields: this.get('custom_fields'), topic_template: this.get('topic_template'), - suppress_from_homepage: this.get('suppress_from_homepage') + suppress_from_homepage: this.get('suppress_from_homepage'), + allowed_tags: this.get('allowed_tags') }, type: this.get('id') ? 'PUT' : 'POST' }); diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs new file mode 100644 index 00000000000..632690bedc2 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/edit-category-tags.hbs @@ -0,0 +1,4 @@ +
+

{{i18n 'category.tags_allowed_tags'}}

+ {{tag-chooser placeholderKey="category.tags_placeholder" tags=category.allowed_tags}} +
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index 44c91b570c7..eb72ca673b3 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -98,7 +98,7 @@
{{plugin-outlet "composer-fields-below"}} {{#if canEditTags}} - {{tag-chooser tags=model.tags tabIndex="4"}} + {{tag-chooser tags=model.tags tabIndex="4" categoryId=model.categoryId}} {{/if}} {{i18n 'cancel'}} diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs index 6cde3451daf..10282704c8f 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs +++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs @@ -7,6 +7,9 @@ {{edit-category-tab panels=panels selectedTab=selectedTab tab="settings"}} {{edit-category-tab panels=panels selectedTab=selectedTab tab="images"}} {{edit-category-tab panels=panels selectedTab=selectedTab tab="topic-template"}} + {{#if siteSettings.tagging_enabled}} + {{edit-category-tab panels=panels selectedTab=selectedTab tab="tags"}} + {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index e654107a457..cb84e78b4fb 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -25,7 +25,7 @@ {{#if canEditTags}}
- {{tag-chooser tags=buffered.tags}} + {{tag-chooser tags=buffered.tags categoryId=buffered.category_id}} {{/if}} {{plugin-outlet "edit-topic"}} diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 5eea9591f08..4cfbeea2a84 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -194,7 +194,8 @@ class CategoriesController < ApplicationController :allow_badges, :topic_template, :custom_fields => [params[:custom_fields].try(:keys)], - :permissions => [*p.try(:keys)]) + :permissions => [*p.try(:keys)], + :allowed_tags => []) end end diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index c5040d3a2bc..035febb6013 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -104,18 +104,15 @@ class TagsController < ::ApplicationController end def search - query = self.class.tags_by_count(guardian, params.slice(:limit)) - term = params[:q] - if term.present? - term.gsub!(/[^a-z0-9\.\-\_]*/, '') - term.gsub!("_", "\\_") - query = query.where('tags.name like ?', "%#{term}%") - end - - if params[:filterForInput] && !guardian.is_staff? - staff_tag_names = SiteSetting.staff_tags.split("|") - query = query.where('tags.name NOT IN (?)', staff_tag_names) if staff_tag_names.present? - end + query = DiscourseTagging.filter_allowed_tags( + self.class.tags_by_count(guardian, params.slice(:limit)), + guardian, + { + for_input: params[:filterForInput], + term: params[:q], + category: params[:categoryId] ? Category.find_by_id(params[:categoryId]) : nil + } + ) tags = query.count.map {|t, c| { id: t, text: t, count: c } } diff --git a/app/models/category.rb b/app/models/category.rb index 37142c7f861..506950ec1f0 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -55,6 +55,9 @@ class Category < ActiveRecord::Base belongs_to :parent_category, class_name: 'Category' has_many :subcategories, class_name: 'Category', foreign_key: 'parent_category_id' + has_many :category_tags + has_many :tags, through: :category_tags + scope :latest, ->{ order('topic_count desc') } scope :secured, ->(guardian = nil) { @@ -312,6 +315,12 @@ SQL end end + def allowed_tags=(tag_names) + if self.tags.pluck(:name).sort != tag_names.sort + self.tags = Tag.where(name: tag_names).all + end + end + def downcase_email self.email_in = (email_in || "").strip.downcase.presence end diff --git a/app/models/category_tag.rb b/app/models/category_tag.rb new file mode 100644 index 00000000000..dcda998ffa0 --- /dev/null +++ b/app/models/category_tag.rb @@ -0,0 +1,4 @@ +class CategoryTag < ActiveRecord::Base + belongs_to :category + belongs_to :tag +end diff --git a/app/models/tag.rb b/app/models/tag.rb index 3d03aa83d3f..df544cd0220 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -1,8 +1,13 @@ class Tag < ActiveRecord::Base validates :name, presence: true, uniqueness: true + + has_many :tag_users # notification settings + has_many :topic_tags, dependent: :destroy has_many :topics, through: :topic_tags - has_many :tag_users + + has_many :category_tags, dependent: :destroy + has_many :categories, through: :category_tags def self.tags_by_count_query(opts={}) q = TopicTag.joins(:tag, :topic).group("topic_tags.tag_id, tags.name").order('count_all DESC') diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb index 74947fde9bf..bf83663d485 100644 --- a/app/serializers/category_serializer.rb +++ b/app/serializers/category_serializer.rb @@ -13,7 +13,8 @@ class CategorySerializer < BasicCategorySerializer :cannot_delete_reason, :is_special, :allow_badges, - :custom_fields + :custom_fields, + :allowed_tags def group_permissions @group_permissions ||= begin @@ -77,4 +78,12 @@ class CategorySerializer < BasicCategorySerializer (user && CategoryUser.where(user: user, category: object).first.try(:notification_level)) end + def include_allowed_tags? + SiteSetting.tagging_enabled + end + + def allowed_tags + object.tags.pluck(:name) + end + end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index a6dcf4e17a9..d583c2bd8ca 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1716,6 +1716,9 @@ en: general: 'General' settings: 'Settings' topic_template: "Topic Template" + tags: "Tags" + tags_allowed_tags: "Tags that can only be used in this category:" + tags_placeholder: "(Optional) list of allowed tags" delete: 'Delete Category' create: 'New Category' create_long: 'Create a new category' diff --git a/db/migrate/20160527191614_create_category_tags.rb b/db/migrate/20160527191614_create_category_tags.rb new file mode 100644 index 00000000000..9ec7566e6f9 --- /dev/null +++ b/db/migrate/20160527191614_create_category_tags.rb @@ -0,0 +1,12 @@ +class CreateCategoryTags < ActiveRecord::Migration + def change + create_table :category_tags do |t| + t.references :category, null: false + t.references :tag, null: false + t.timestamps + end + + add_index :category_tags, [:category_id, :tag_id], name: "idx_category_tags_ix1", unique: true + add_index :category_tags, [:tag_id, :category_id], name: "idx_category_tags_ix2", unique: true + end +end diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb index cb5ce1d7c26..ca6b9bdc5a2 100644 --- a/lib/discourse_tagging.rb +++ b/lib/discourse_tagging.rb @@ -32,12 +32,14 @@ module DiscourseTagging end if tag_names.present? - tags = Tag.where(name: tag_names).all - if tags.size < tag_names.size - existing_names = tags.map(&:name) + category = topic.category + tags = filter_allowed_tags(Tag.where(name: tag_names), guardian, { for_input: true, category: category }).to_a + + if tags.size < tag_names.size && (category.nil? || category.tags.count == 0) tag_names.each do |name| - next if existing_names.include?(name) - tags << Tag.create(name: name) + unless Tag.where(name: name).exists? + tags << Tag.create(name: name) + end end end @@ -52,6 +54,34 @@ module DiscourseTagging true end + # Options: + # term: a search term to filter tags by name + # for_input: result is for an input field, so only show permitted tags + # category: a Category to which the object being tagged belongs + def self.filter_allowed_tags(query, guardian, opts={}) + term = opts[:term] + if term.present? + term.gsub!(/[^a-z0-9\.\-\_]*/, '') + term.gsub!("_", "\\_") + query = query.where('tags.name like ?', "%#{term}%") + end + + if opts[:for_input] + unless guardian.is_staff? + staff_tag_names = SiteSetting.staff_tags.split("|") + query = query.where('tags.name NOT IN (?)', staff_tag_names) if staff_tag_names.present? + end + + if opts[:category] && opts[:category].tags.count > 0 + query = query.where("tags.id IN (SELECT tag_id FROM category_tags WHERE category_id = ?)", opts[:category].id) + elsif CategoryTag.exists? + query = query.where("tags.id NOT IN (SELECT tag_id FROM category_tags)") + end + end + + query + end + def self.auto_notify_for(tags, topic) TagUser.auto_watch_new_topic(topic, tags) TagUser.auto_track_new_topic(topic, tags) @@ -78,17 +108,16 @@ module DiscourseTagging return unless tags.present? - tags.map! {|t| clean_tag(t) } - tags.delete_if {|t| t.blank? } - tags.uniq! + tag_names = tags.map {|t| clean_tag(t) } + tag_names.delete_if {|t| t.blank? } + tag_names.uniq! # If the user can't create tags, remove any tags that don't already exist - # TODO: this is doing a full count, it should just check first or use a cache unless guardian.can_create_tag? - tags = Tag.where(name: tags).pluck(:name) + tag_names = Tag.where(name: tag_names).pluck(:name) end - return tags[0...SiteSetting.max_tags_per_topic] + return tag_names[0...SiteSetting.max_tags_per_topic] end def self.notification_key(tag_id) diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb new file mode 100644 index 00000000000..0c3c4fd95fd --- /dev/null +++ b/spec/integration/category_tag_spec.rb @@ -0,0 +1,55 @@ +# encoding: UTF-8 + +require 'rails_helper' +require_dependency 'post_creator' + +describe "category tag restrictions" do + let!(:tag1) { Fabricate(:tag) } + let!(:tag2) { Fabricate(:tag) } + let!(:tag3) { Fabricate(:tag) } + let!(:tag4) { Fabricate(:tag) } + + let(:user) { Fabricate(:user) } + let(:admin) { Fabricate(:admin) } + + before do + SiteSetting.tagging_enabled = true + SiteSetting.min_trust_to_create_tag = 0 + SiteSetting.min_trust_level_to_tag_topics = 0 + end + + context "tags restricted to one category" do + let(:category_with_tags) { Fabricate(:category) } + let(:other_category) { Fabricate(:category) } + + before do + category_with_tags.tags = [tag1, tag2] + end + + it "tags belonging to that category can only be used there" do + post = create_post(category: category_with_tags, tags: [tag1.name, tag2.name, tag3.name]) + expect(post.topic.tags.map(&:name).sort).to eq([tag1.name, tag2.name].sort) + + post = create_post(category: other_category, tags: [tag1.name, tag2.name, tag3.name]) + expect(post.topic.tags.map(&:name)).to eq([tag3.name]) + end + + it "search can show only permitted tags" do + expect(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user)).count).to eq(Tag.count) + expect(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true, category: category_with_tags}).pluck(:name).sort).to eq([tag1.name, tag2.name].sort) + expect(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true}).pluck(:name).sort).to eq([tag3.name, tag4.name].sort) + end + + it "can't create new tags in a restricted category" do + post = create_post(category: category_with_tags, tags: [tag1.name, "newtag"]) + expect(post.topic.tags.map(&:name)).to eq([tag1.name]) + post = create_post(category: category_with_tags, tags: [tag1.name, "newtag"], user: admin) + expect(post.topic.tags.map(&:name)).to eq([tag1.name]) + end + + it "can create new tags in a non-restricted category" do + post = create_post(category: other_category, tags: [tag3.name, "newtag"]) + expect(post.topic.tags.map(&:name).sort).to eq([tag3.name, "newtag"].sort) + end + end +end From e9ba6e4e99cdec212b92203ab6ce89db9745de52 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 31 May 2016 07:57:15 +1000 Subject: [PATCH 041/320] clean up formatting reports --- lib/scheduler/views/history.erb | 12 +++++++----- lib/scheduler/views/scheduler.erb | 2 +- lib/scheduler/web.rb | 17 +++++++++++++++++ 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/lib/scheduler/views/history.erb b/lib/scheduler/views/history.erb index f6c8f5c92fc..c1cc026ba71 100644 --- a/lib/scheduler/views/history.erb +++ b/lib/scheduler/views/history.erb @@ -15,7 +15,7 @@ Hostname:Pid Live Slots delta Started At - Duration (ms) + Duration @@ -28,11 +28,13 @@ <%= stat.live_slots_finish - stat.live_slots_start %> <% end %> - <%= relative_time stat.started_at %> - <%= stat.duration_ms %> + <%= sane_time stat.started_at %> + <%= sane_duration stat.duration_ms %> - <% if !stat.success %> - FAILED + <% if stat.success.nil? %> + RUNNING + <% elsif !stat.success %> + FAILED <% end %> diff --git a/lib/scheduler/views/scheduler.erb b/lib/scheduler/views/scheduler.erb index d50aaa861ea..85fb6da8d97 100644 --- a/lib/scheduler/views/scheduler.erb +++ b/lib/scheduler/views/scheduler.erb @@ -43,7 +43,7 @@ <%= @info.prev_result %> - <%= @info.prev_duration %> + <%= sane_duration @info.prev_duration %> <%= @info.current_owner %> diff --git a/lib/scheduler/web.rb b/lib/scheduler/web.rb index d3af236433f..6d414ce8e91 100644 --- a/lib/scheduler/web.rb +++ b/lib/scheduler/web.rb @@ -4,6 +4,23 @@ module Scheduler VIEWS = File.expand_path('views', File.dirname(__FILE__)) unless defined? VIEWS def self.registered(app) + + app.helpers do + def sane_time(time) + return unless time + time + end + + def sane_duration(duration) + return unless duration + if duration < 1000 + "#{duration}ms" + elsif duration < 60*1000 + "#{'%.2f' % (duration/1000.0)} secs" + end + end + end + app.get "/scheduler" do RailsMultisite::ConnectionManagement.with_connection("default") do @manager = Scheduler::Manager.without_runner From 4a7567b48529759a63e3f05ccfbd5e324d7305fb Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 16 May 2016 14:31:52 -0400 Subject: [PATCH 042/320] UX: Move links from gutter to below posts --- .../discourse/widgets/post-gutter.js.es6 | 72 ---------------- .../discourse/widgets/post-links.js.es6 | 65 +++++++++++++++ .../javascripts/discourse/widgets/post.js.es6 | 5 +- app/assets/stylesheets/common/base/topic.scss | 47 ++++++++++- .../stylesheets/desktop/topic-post.scss | 82 ++----------------- app/assets/stylesheets/desktop/topic.scss | 23 +----- app/assets/stylesheets/mobile/topic-post.scss | 4 - config/locales/client.en.yml | 4 + ...ter-test.js.es6 => post-links-test.js.es6} | 17 ++-- 9 files changed, 137 insertions(+), 182 deletions(-) delete mode 100644 app/assets/javascripts/discourse/widgets/post-gutter.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/post-links.js.es6 rename test/javascripts/widgets/{post-gutter-test.js.es6 => post-links-test.js.es6} (72%) diff --git a/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 b/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 deleted file mode 100644 index d8352d2ae4b..00000000000 --- a/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 +++ /dev/null @@ -1,72 +0,0 @@ -import { iconNode } from 'discourse/helpers/fa-icon'; -import { createWidget } from 'discourse/widgets/widget'; -import { h } from 'virtual-dom'; -import RawHtml from 'discourse/widgets/raw-html'; - -const MAX_GUTTER_LINKS = 5; - -export default createWidget('post-gutter', { - tagName: 'div.gutter', - buildKey: (attrs) => `post-gutter-${attrs.id}`, - - defaultState() { - return { collapsed: true }; - }, - - html(attrs, state) { - const links = this.attrs.links || []; - - const result = []; - let toShow = links.length; - if (state.collapsed && toShow > MAX_GUTTER_LINKS) { toShow = MAX_GUTTER_LINKS; } - - const seenTitles = {}; - - let titleCount = 0; - links.forEach(function(l) { - let title = l.title; - if (title && !seenTitles[title]) { - seenTitles[title] = true; - titleCount++; - if (result.length < toShow) { - const linkBody = [new RawHtml({html: `${Discourse.Emoji.unescape(Handlebars.Utils.escapeExpression(title))}`})]; - if (l.clicks) { - linkBody.push(h('span.badge.badge-notification.clicks', l.clicks.toString())); - } - - const className = l.reflection ? 'inbound' : 'outbound'; - const link = h('a.track-link', {className, attributes: {href: l.url}}, linkBody); - result.push(h('li', link)); - } - } - }); - - if (state.collapsed) { - const remaining = titleCount - MAX_GUTTER_LINKS; - - if (remaining > 0) { - result.push(h('li', h('a.toggle-more', I18n.t('post.more_links', {count: remaining})))); - } - } - - if (attrs.canReplyAsNewTopic) { - result.push(h('a.reply-new', [iconNode('plus'), I18n.t('post.reply_as_new_topic')])); - } - - return h('ul.post-links', result); - }, - - click(e) { - const $target = $(e.target); - if ($target.hasClass('toggle-more')) { - this.sendWidgetAction('showAll'); - } else if ($target.closest('.reply-new').length) { - this.sendWidgetAction('newTopicAction'); - } - return true; - }, - - showAll() { - this.state.collapsed = false; - } -}); diff --git a/app/assets/javascripts/discourse/widgets/post-links.js.es6 b/app/assets/javascripts/discourse/widgets/post-links.js.es6 new file mode 100644 index 00000000000..45f7c217a32 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/post-links.js.es6 @@ -0,0 +1,65 @@ +import { iconNode } from 'discourse/helpers/fa-icon'; +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import RawHtml from 'discourse/widgets/raw-html'; + +export default createWidget('post-links', { + tagName: 'div.post-links-container', + buildKey: (attrs) => `post-links-${attrs.id}`, + + defaultState() { + return { collapsed: true }; + }, + + html(attrs, state) { + const links = this.attrs.links || []; + + const result = []; + if (links.length) { + if (state.collapsed) { + return this.attach('link', { + labelCount: `post_links.title`, + count: links.length, + action: 'expandLinks', + className: 'expand-links' + }); + } + + const seenTitles = {}; + + let titleCount = 0; + links.forEach(function(l) { + let title = l.title; + if (title && !seenTitles[title]) { + seenTitles[title] = true; + titleCount++; + const linkBody = [new RawHtml({html: `${Discourse.Emoji.unescape(Handlebars.Utils.escapeExpression(title))}`})]; + if (l.clicks) { + linkBody.push(h('span.badge.badge-notification.clicks', l.clicks.toString())); + } + + result.push(h('li', + h('a.track-link', { + className: l.reflection ? 'inbound' : 'outbound', + attributes: {href: l.url} + }, [linkBody, iconNode(l.reflection ? 'arrow-left' : 'arrow-right')]) + )); + } + }); + } + + if (attrs.canReplyAsNewTopic) { + result.push(h('li', this.attach('link', { + className: 'reply-new', + contents: () => [I18n.t('post.reply_as_new_topic'), iconNode('plus')], + action: 'newTopicAction' + }))); + } + + return h('ul.post-links', result); + }, + + expandLinks() { + this.state.collapsed = false; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6 index 7dcd728c57a..8e42b79478a 100644 --- a/app/assets/javascripts/discourse/widgets/post.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post.js.es6 @@ -306,6 +306,7 @@ createWidget('post-body', { if (attrs.showTopicMap) { result.push(this.attach('topic-map', attrs)); } + result.push(this.attach('post-links', attrs)); return result; } @@ -341,9 +342,7 @@ createWidget('post-article', { rows.push(h('div.row', h('section.embedded-posts.top.topic-body.offset2', replies))); } - rows.push(h('div.row', [this.attach('post-avatar', attrs), - this.attach('post-body', attrs), - this.attach('post-gutter', attrs)])); + rows.push(h('div.row', [this.attach('post-avatar', attrs), this.attach('post-body', attrs)])); return rows; }, diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index 11e552d0fd5..382f488bc33 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -1,5 +1,4 @@ #topic-title { - .title-wrapper { float: left; width: 90%; @@ -79,3 +78,49 @@ } } } + +.post-links-container { + @include unselectable; + clear: both; + text-align: right; + margin-top: 1em; + + .expand-links { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } + + .track-link { + padding-left: 10px; + display: inline-block; + overflow: hidden; + } + + ul { + list-style: none; + + li { + margin-bottom: 0.5em; + a[href] { + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } + i { + font-size: 0.857em; + margin-left: 0.5em; + } + } + } + + a.reply-new { + i { + background: $secondary; + border-radius: 20px; + transition: all linear .15s; + } + &:hover { + color: $tertiary; + i { + background: dark-light-diff($tertiary, $secondary, 85%, -65%); + } + } + } +} diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index f417858dd6c..674426a81b7 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -47,25 +47,6 @@ h1 .topic-statuses .topic-status i { } } -.topic-post { - .gutter { - .reply-new { - .discourse-no-touch & { - opacity:0; - transition: opacity 0.7s ease-in-out; - } - .discourse-touch & {opacity: 1;} - } - } - - &:hover .gutter, .selected .gutter { - .reply-new, - .track-link { - opacity:1; - } - } -} - section.post-menu-area { position: relative; } @@ -637,51 +618,6 @@ blockquote { } - - -.gutter { - margin-top: 13px; - width: 100%; - box-sizing: border-box; - z-index: 1; - padding-left: 757px; - - ul {margin: 0;} - li {margin-bottom: 10px;} - i {font-size: 0.857em;} - - .reply-new { - padding-left: 27px; - display: inline-block; - overflow:hidden; - } - - .track-link { - padding-left: 10px; - display: inline-block; - overflow: hidden; - } - - .post-links { - list-style-type: none; - position: relative; - line-height: 18px; - word-wrap: break-word; - a i { - position: relative; - margin-right: 7px; - margin-top: -2px; - margin-left: -17px; - } - - a.toggle-more { - display: block; - text-align: right; - } - - } -} - // variables are used to calculate the width of .gap $topic-body-width: 690px; $topic-body-width-padding: 11px; @@ -925,17 +861,17 @@ a.attachment:before { } .private_message .gutter, .deleted-topic .gutter,.read_restricted .gutter { - position: relative; + position: relative; } .deleted-topic .gutter:before { - display: block; - position: absolute; - left: 767px; - color: rgba(dark-light-diff($primary, $secondary, 90%, -65%) , .8); - font: 6.429em/1 FontAwesome; - content: "\f014"; - z-index: -5; + display: block; + position: absolute; + left: 767px; + color: rgba(dark-light-diff($primary, $secondary, 90%, -65%) , .8); + font: 6.429em/1 FontAwesome; + content: "\f014"; + z-index: -5; } .topic-meta-data { @@ -1003,7 +939,7 @@ and (max-width : 870px) { .gutter { display: none; - } + } .topic-avatar { width: 45px; diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index d8dc7ccf9d5..c91647451a8 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -8,6 +8,7 @@ margin-top: 10px; } } + .post-menu-area { margin-bottom: 10px; margin-top: 20px; @@ -53,8 +54,6 @@ margin-bottom: 2px; } .private-message-glyph { display: none; } - - } .private-message-glyph { @@ -64,26 +63,6 @@ } .private_message #topic-title .private-message-glyph { display: inline; } -a.reply-new { - margin-top: 3px; - color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); - i { - margin-right: 3px; - background: $secondary; - padding: 1.5px 3px; - border-radius: 20px; - transition: all linear .15s; - margin-left: -20px; - } -} - -a:hover.reply-new { - color: $tertiary; - i { - background: dark-light-diff($tertiary, $secondary, 85%, -65%); - } -} - .topic-error { padding: 18px; width: 60%; diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index b7b820a3c00..8cee5412cf7 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -143,10 +143,6 @@ button { } } -.reply-new { - display: none; -} - .post-actions { /* overriding display: here was causing hidden element to take up space */ } diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index d583c2bd8ca..537595166cb 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1815,6 +1815,10 @@ en: clicks: one: "1 click" other: "%{count} clicks" + post_links: + title: + one: "1 post link" + other: "%{count} post links" topic_statuses: warning: diff --git a/test/javascripts/widgets/post-gutter-test.js.es6 b/test/javascripts/widgets/post-links-test.js.es6 similarity index 72% rename from test/javascripts/widgets/post-gutter-test.js.es6 rename to test/javascripts/widgets/post-links-test.js.es6 index 2de86d6761d..b302d20d310 100644 --- a/test/javascripts/widgets/post-gutter-test.js.es6 +++ b/test/javascripts/widgets/post-links-test.js.es6 @@ -1,9 +1,9 @@ import { moduleForWidget, widgetTest } from 'helpers/widget-test'; -moduleForWidget('post-gutter'); +moduleForWidget('post-links'); widgetTest("duplicate links", { - template: '{{mount-widget widget="post-gutter" args=args}}', + template: '{{mount-widget widget="post-links" args=args}}', setup() { this.set('args', { id: 2, @@ -14,12 +14,15 @@ widgetTest("duplicate links", { }); }, test(assert) { - assert.equal(this.$('.post-links a.track-link').length, 1, 'it hides the dupe link'); + click('.expand-links'); + andThen(() => { + assert.equal(this.$('.post-links a.track-link').length, 1, 'it hides the dupe link'); + }); } }); widgetTest("collapsed links", { - template: '{{mount-widget widget="post-gutter" args=args}}', + template: '{{mount-widget widget="post-links" args=args}}', setup() { this.set('args', { id: 1, @@ -35,8 +38,8 @@ widgetTest("collapsed links", { }); }, test(assert) { - assert.equal(this.$('.post-links a.track-link').length, 5, 'collapses by default'); - click('a.toggle-more'); + assert.ok(this.$('.expand-links').length, 'collapsed by default'); + click('a.expand-links'); andThen(() => { assert.equal(this.$('.post-links a.track-link').length, 7); }); @@ -44,7 +47,7 @@ widgetTest("collapsed links", { }); widgetTest("reply as new topic", { - template: '{{mount-widget widget="post-gutter" args=args newTopicAction="newTopicAction"}}', + template: '{{mount-widget widget="post-links" args=args newTopicAction="newTopicAction"}}', setup() { this.set('args', { canReplyAsNewTopic: true }); this.on('newTopicAction', () => this.newTopicTriggered = true); From 751e354ca62a5bea2ec9136b3091c26cc4bf2995 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 16 May 2016 15:26:04 -0400 Subject: [PATCH 043/320] Refactor `topic-progress` into a component --- .../components/topic-progress.js.es6 | 205 ++++++++++++++++++ .../controllers/topic-progress.js.es6 | 111 ---------- .../discourse/controllers/topic.js.es6 | 16 +- .../discourse/lib/keyboard-shortcuts.js.es6 | 2 +- .../javascripts/discourse/lib/url.js.es6 | 5 - .../discourse/routes/topic-from-params.js.es6 | 11 +- .../javascripts/discourse/routes/topic.js.es6 | 2 - .../{ => components}/topic-progress.hbs | 4 +- .../javascripts/discourse/templates/topic.hbs | 5 +- .../discourse/views/topic-progress.js.es6 | 109 ---------- .../javascripts/controllers/topic-test.js.es6 | 2 +- 11 files changed, 229 insertions(+), 243 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/topic-progress.js.es6 delete mode 100644 app/assets/javascripts/discourse/controllers/topic-progress.js.es6 rename app/assets/javascripts/discourse/templates/{ => components}/topic-progress.hbs (90%) delete mode 100644 app/assets/javascripts/discourse/views/topic-progress.js.es6 diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6 new file mode 100644 index 00000000000..e87f66ebbd9 --- /dev/null +++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6 @@ -0,0 +1,205 @@ +import DiscourseURL from 'discourse/lib/url'; +import { default as computed, observes } from 'ember-addons/ember-computed-decorators'; + +export default Ember.Component.extend({ + elementId: 'topic-progress-wrapper', + classNameBindings: ['docked'], + expanded: false, + toPostIndex: null, + docked: false, + + postStream: Ember.computed.alias('topic.postStream'), + + @computed('postStream.loaded', 'progressPosition', 'postStream.filteredPostsCount', 'postStream.highest_post_number') + streamPercentage(loaded, progressPosition, filteredPostsCount, highestPostNumber) { + if (!loaded) { return 0; } + if (highestPostNumber === 0) { return 0; } + const perc = progressPosition / filteredPostsCount; + return (perc > 1.0) ? 1.0 : perc; + }, + + @computed('progressPosition') + jumpTopDisabled(progressPosition) { + return progressPosition <= 3; + }, + + @computed('postStream.filteredPostsCount', 'topic.highest_post_number', 'progressPosition') + jumpBottomDisabled(filteredPostsCount, highestPostNumber, progressPosition) { + return progressPosition >= filteredPostsCount || progressPosition >= highestPostNumber; + }, + + + @computed('postStream.loaded', 'topic.currentPost', 'postStream.filteredPostsCount') + hideProgress(loaded, currentPost, filteredPostsCount) { + return (!loaded) || (!currentPost) || (filteredPostsCount < 2); + }, + + @computed('postStream.filteredPostsCount') + hugeNumberOfPosts(filteredPostsCount) { + return filteredPostsCount >= this.siteSettings.short_progress_text_threshold; + }, + + @computed('hugeNumberOfPosts', 'topic.highest_post_number') + jumpToBottomTitle(hugeNumberOfPosts, highestPostNumber) { + if (hugeNumberOfPosts) { + return I18n.t('topic.progress.jump_bottom_with_number', { post_number: highestPostNumber }); + } else { + return I18n.t('topic.progress.jump_bottom'); + } + }, + + @observes('streamPercentage', 'postStream.stream.[]') + _updateBar() { + Ember.run.scheduleOnce('afterRender', this, this._updateProgressBar); + }, + + didInsertElement() { + this._super(); + this.appEvents.on("composer:opened", this, this._dock) + .on("composer:resized", this, this._dock) + .on("composer:closed", this, this._dock) + .on("topic:scrolled", this, this._dock); + + // Reflows are expensive. Cache the jQuery selector + // and the width when inserted into the DOM + this._$topicProgress = this.$('#topic-progress'); + + Ember.run.scheduleOnce('afterRender', this, this._updateProgressBar); + }, + + willDestroyElement() { + this._super(); + this.appEvents.off("composer:opened", this, this._dock) + .off("composer:resized", this, this._dock) + .off("composer:closed", this, this._dock) + .off('topic:scrolled', this, this._dock); + }, + + _updateProgressBar() { + // speeds up stuff, bypass jquery slowness and extra checks + if (!this._totalWidth) { + this._totalWidth = this._$topicProgress[0].offsetWidth; + } + const totalWidth = this._totalWidth; + const progressWidth = this.get('streamPercentage') * totalWidth; + + this._$topicProgress.find('.bg') + .css("border-right-width", (progressWidth === totalWidth) ? "0px" : "1px") + .width(progressWidth); + }, + + _dock() { + const maximumOffset = $('#topic-footer-buttons').offset(), + composerHeight = $('#reply-control').height() || 0, + $topicProgressWrapper = this.$(), + style = $topicProgressWrapper.attr('style') || '', + offset = window.pageYOffset || $('html').scrollTop(); + + let isDocked = false; + if (maximumOffset) { + const threshold = maximumOffset.top, + windowHeight = $(window).height(), + topicProgressHeight = $('#topic-progress').height(); + + isDocked = offset >= threshold - windowHeight + topicProgressHeight + composerHeight; + } + + if (composerHeight > 0) { + if (isDocked) { + if (style.indexOf('bottom') >= 0) { + $topicProgressWrapper.css('bottom', ''); + } + } else { + const height = composerHeight + "px"; + if ($topicProgressWrapper.css('bottom') !== height) { + $topicProgressWrapper.css('bottom', height); + } + } + } else { + if (style.indexOf('bottom') >= 0) { + $topicProgressWrapper.css('bottom', ''); + } + } + this.set('docked', isDocked); + }, + + click(e) { + if ($(e.target).parents('#topic-progress').length) { + this.send('toggleExpansion'); + } + }, + + keyDown(e) { + if (this.get('expanded')) { + if (e.keyCode === 13) { + this.$('input').blur(); + this.send('jumpPost'); + } else if (e.keyCode === 27) { + this.send('toggleExpansion'); + } + } + }, + + jumpTo(url) { + this.set('expanded', false); + DiscourseURL.routeTo(url); + }, + + actions: { + toggleExpansion(opts) { + this.toggleProperty('expanded'); + if (this.get('expanded')) { + this.set('toPostIndex', this.get('progressPosition')); + if(opts && opts.highlight){ + // TODO: somehow move to view? + Em.run.next(function(){ + $('.jump-form input').select().focus(); + }); + } + if (!this.site.mobileView && !this.capabilities.isIOS) { + Ember.run.schedule('afterRender', () => this.$('input').focus()); + } + } + }, + + jumpPost() { + let postIndex = parseInt(this.get('toPostIndex'), 10); + + // Validate the post index first + if (isNaN(postIndex) || postIndex < 1) { + postIndex = 1; + } + if (postIndex > this.get('postStream.filteredPostsCount')) { + postIndex = this.get('postStream.filteredPostsCount'); + } + this.set('toPostIndex', postIndex); + const stream = this.get('postStream'); + const postId = stream.findPostIdForPostNumber(postIndex); + + if (!postId) { + Em.Logger.warn("jump-post code broken - requested an index outside the stream array"); + return; + } + + const post = stream.findLoadedPost(postId); + if (post) { + this.jumpTo(this.get('topic').urlForPostNumber(post.get('post_number'))); + } else { + // need to load it + stream.findPostsByIds([postId]).then(arr => { + this.jumpTo(this.get('topic').urlForPostNumber(arr[0].get('post_number'))); + }); + } + }, + + jumpTop() { + this.set('expanded', false); + this.sendAction('jumpTop'); + }, + + jumpBottom() { + this.set('expanded', false); + this.sendAction('jumpBottom'); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/topic-progress.js.es6 b/app/assets/javascripts/discourse/controllers/topic-progress.js.es6 deleted file mode 100644 index 324d3b7357b..00000000000 --- a/app/assets/javascripts/discourse/controllers/topic-progress.js.es6 +++ /dev/null @@ -1,111 +0,0 @@ -import DiscourseURL from 'discourse/lib/url'; - -export default Ember.Controller.extend({ - needs: ['topic'], - progressPosition: null, - expanded: false, - toPostIndex: null, - - actions: { - toggleExpansion(opts) { - this.toggleProperty('expanded'); - if (this.get('expanded')) { - this.set('toPostIndex', this.get('progressPosition')); - if(opts && opts.highlight){ - // TODO: somehow move to view? - Em.run.next(function(){ - $('.jump-form input').select().focus(); - }); - } - } - }, - - jumpPost() { - var postIndex = parseInt(this.get('toPostIndex'), 10); - - // Validate the post index first - if (isNaN(postIndex) || postIndex < 1) { - postIndex = 1; - } - if (postIndex > this.get('model.postStream.filteredPostsCount')) { - postIndex = this.get('model.postStream.filteredPostsCount'); - } - this.set('toPostIndex', postIndex); - var stream = this.get('model.postStream'), - postId = stream.findPostIdForPostNumber(postIndex); - - if (!postId) { - Em.Logger.warn("jump-post code broken - requested an index outside the stream array"); - return; - } - - var post = stream.findLoadedPost(postId); - if (post) { - this.jumpTo(this.get('model').urlForPostNumber(post.get('post_number'))); - } else { - var self = this; - // need to load it - stream.findPostsByIds([postId]).then(function(arr) { - post = arr[0]; - self.jumpTo(self.get('model').urlForPostNumber(post.get('post_number'))); - }); - } - }, - - jumpTop() { - this.jumpTo(this.get('model.firstPostUrl')); - }, - - jumpBottom() { - this.jumpTo(this.get('model.lastPostUrl')); - } - }, - - // Route and close the expansion - jumpTo(url) { - this.set('expanded', false); - DiscourseURL.routeTo(url); - }, - - streamPercentage: function() { - if (!this.get('model.postStream.loaded')) { return 0; } - if (this.get('model.postStream.highest_post_number') === 0) { return 0; } - var perc = this.get('progressPosition') / this.get('model.postStream.filteredPostsCount'); - return (perc > 1.0) ? 1.0 : perc; - }.property('model.postStream.loaded', 'progressPosition', 'model.postStream.filteredPostsCount'), - - jumpTopDisabled: function() { - return this.get('progressPosition') <= 3; - }.property('progressPosition'), - - filteredPostCountChanged: function(){ - if(this.get('model.postStream.filteredPostsCount') < this.get('progressPosition')){ - this.set('progressPosition', this.get('model.postStream.filteredPostsCount')); - } - }.observes('model.postStream.filteredPostsCount'), - - jumpBottomDisabled: function() { - return this.get('progressPosition') >= this.get('model.postStream.filteredPostsCount') || - this.get('progressPosition') >= this.get('model.highest_post_number'); - }.property('model.postStream.filteredPostsCount', 'model.highest_post_number', 'progressPosition'), - - hideProgress: function() { - if (!this.get('model.postStream.loaded')) return true; - if (!this.get('model.currentPost')) return true; - if (this.get('model.postStream.filteredPostsCount') < 2) return true; - return false; - }.property('model.postStream.loaded', 'model.currentPost', 'model.postStream.filteredPostsCount'), - - hugeNumberOfPosts: function() { - return (this.get('model.postStream.filteredPostsCount') >= Discourse.SiteSettings.short_progress_text_threshold); - }.property('model.highest_post_number'), - - jumpToBottomTitle: function() { - if (this.get('hugeNumberOfPosts')) { - return I18n.t('topic.progress.jump_bottom_with_number', {post_number: this.get('model.highest_post_number')}); - } else { - return I18n.t('topic.progress.jump_bottom'); - } - }.property('hugeNumberOfPosts', 'model.highest_post_number') - -}); diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 7c7c332666d..8ddd92d86ff 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -10,7 +10,7 @@ import DiscourseURL from 'discourse/lib/url'; import { categoryBadgeHTML } from 'discourse/helpers/category-link'; export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { - needs: ['modal', 'composer', 'quote-button', 'topic-progress', 'application'], + needs: ['modal', 'composer', 'quote-button', 'application'], multiSelect: false, allPostsSelected: false, editingTopic: false, @@ -21,10 +21,16 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { enteredAt: null, retrying: false, adminMenuVisible: false, + screenProgressPosition: null, showRecover: Em.computed.and('model.deleted', 'model.details.can_recover'), isFeatured: Em.computed.or("model.pinned_at", "model.isBanner"), + @computed('screenProgressPosition', 'model.postStream.filteredPostsCount') + progressPosition(pp, filteredPostsCount) { + return (filteredPostsCount < pp) ? filteredPostsCount : pp; + }, + _titleChanged: function() { const title = this.get('model.title'); if (!Ember.isEmpty(title)) { @@ -203,7 +209,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { const postStream = this.get('model.postStream'); const lastLoadedPost = postStream.get('posts.lastObject'); - this.set('controllers.topic-progress.progressPosition', postStream.progressIndexOfPost(post)); + this.set('screenProgressPosition', postStream.progressIndexOfPost(post)); if (lastLoadedPost && lastLoadedPost === post && postStream.get('canAppendMore')) { postStream.appendMore().then(() => refresh()); @@ -379,7 +385,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }, jumpTop() { - this.get('controllers.topic-progress').send('jumpTop'); + DiscourseURL.routeTo(this.get('model.firstPostUrl')); + }, + + jumpBottom() { + DiscourseURL.routeTo(this.get('model.lastPostUrl')); }, selectAll() { diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 index e186bac8045..b62f0885726 100644 --- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 +++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 @@ -116,7 +116,7 @@ export default { _jumpTo(direction) { if ($('.container.posts').length) { - this.container.lookup('controller:topic-progress').send(direction); + this.container.lookup('controller:topic').send(direction); } }, diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index 8fbd12d7d95..a58011f0f09 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -232,11 +232,6 @@ const DiscourseURL = Ember.Object.extend({ enteredAt: new Date().getTime().toString() }); - const closestPost = postStream.closestPostForPostNumber(closest); - const progress = postStream.progressIndexOfPost(closestPost); - const progressController = container.lookup('controller:topic-progress'); - - progressController.set('progressPosition', progress); this.appEvents.trigger('post:highlight', closest); }).then(() => { DiscourseURL.jumpToPost(closest, {skipIfOnScreen: true}); diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 index f6d7216f60c..afd819a49e2 100644 --- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 @@ -15,7 +15,6 @@ export default Discourse.Route.extend({ topic = this.modelFor('topic'), postStream = topic.get('postStream'), topicController = this.controllerFor('topic'), - topicProgressController = this.controllerFor('topic-progress'), composerController = this.controllerFor('composer'); // I sincerely hope no topic gets this many posts @@ -28,20 +27,14 @@ export default Discourse.Route.extend({ // we need better handling and logging for this condition. // The post we requested might not exist. Let's find the closest post - const closestPost = postStream.closestPostForPostNumber(params.nearPost || 1), - closest = closestPost.get('post_number'), - progress = postStream.progressIndexOfPost(closestPost); + const closestPost = postStream.closestPostForPostNumber(params.nearPost || 1); + const closest = closestPost.get('post_number'); topicController.setProperties({ 'model.currentPost': closest, enteredAt: new Date().getTime().toString(), }); - topicProgressController.setProperties({ - progressPosition: progress, - expanded: false - }); - // Highlight our post after the next render Ember.run.scheduleOnce('afterRender', function() { self.appEvents.trigger('post:highlight', closest); diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index cd627ce46d9..c8d4c4594e9 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -210,8 +210,6 @@ const TopicRoute = Discourse.Route.extend({ this.topicTrackingState.trackIncoming('all'); controller.subscribe(); - this.controllerFor('topic-progress').set('model', model); - // We reset screen tracking every time a topic is entered this.screenTrack.start(model.get('id'), controller); } diff --git a/app/assets/javascripts/discourse/templates/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs similarity index 90% rename from app/assets/javascripts/discourse/templates/topic-progress.hbs rename to app/assets/javascripts/discourse/templates/components/topic-progress.hbs index 682cb2f46f5..602bd78f43e 100644 --- a/app/assets/javascripts/discourse/templates/topic-progress.hbs +++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs @@ -18,7 +18,9 @@ {{/if}}
From 171dbd4b099558fd5c9e688cba261e65e4db9b03 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 9 Jun 2016 15:51:46 -0400 Subject: [PATCH 260/320] Allow redirects on Facebook Browser --- .../users/omniauth_callbacks/complete.html.erb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/views/users/omniauth_callbacks/complete.html.erb b/app/views/users/omniauth_callbacks/complete.html.erb index 3d4f96cea3b..07bd7014636 100644 --- a/app/views/users/omniauth_callbacks/complete.html.erb +++ b/app/views/users/omniauth_callbacks/complete.html.erb @@ -22,17 +22,14 @@

<%=t "login.close_window" %>

From a6090339a7986fcb0bcea0a9966cab7a62d65539 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 9 Jun 2016 16:00:19 -0400 Subject: [PATCH 261/320] FEATURE: tag group options: limit usage of one tag per group, tags in a group can't be used unless a prerequisite tag is used --- .../discourse/components/tag-chooser.js.es6 | 16 ++- .../discourse/models/tag-group.js.es6 | 4 +- .../discourse/templates/tag-groups-show.hbs | 26 +++-- .../stylesheets/common/base/tagging.scss | 14 +++ app/controllers/tag_groups_controller.rb | 7 +- app/controllers/tags_controller.rb | 9 +- app/models/tag_group.rb | 12 ++ app/models/tag_group_membership.rb | 2 +- app/serializers/tag_group_serializer.rb | 6 +- config/locales/client.en.yml | 4 + .../20160607213656_add_tag_group_options.rb | 6 + lib/discourse_tagging.rb | 67 ++++++++--- spec/fabricators/tag_fabricator.rb | 2 +- spec/integration/category_tag_spec.rb | 109 ++++++++++++++++-- 14 files changed, 243 insertions(+), 41 deletions(-) create mode 100644 db/migrate/20160607213656_add_tag_group_options.rb diff --git a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 index d9b3863cf58..4f33e3b6d7e 100644 --- a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 +++ b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 @@ -36,12 +36,19 @@ export default Ember.TextField.extend({ const site = this.site, self = this, filterRegexp = new RegExp(this.site.tags_filter_regexp, "g"); + var limit = this.siteSettings.max_tags_per_topic; + + if (this.get('unlimitedTagCount')) { + limit = null; + } else if (this.get('limit')) { + limit = parseInt(this.get('limit')); + } this.$().select2({ tags: true, placeholder: I18n.t(this.get('placeholderKey') || 'tagging.choose_for_topic'), maximumInputLength: this.siteSettings.max_tag_length, - maximumSelectionSize: self.get('unlimitedTagCount') ? null : this.siteSettings.max_tags_per_topic, + maximumSelectionSize: limit, initSelection(element, callback) { const data = []; @@ -92,7 +99,12 @@ export default Ember.TextField.extend({ url: Discourse.getURL("/tags/filter/search"), dataType: 'json', data: function (term) { - const d = { q: term, limit: self.siteSettings.max_tag_search_results, categoryId: self.get('categoryId') }; + const d = { + q: term, + limit: self.siteSettings.max_tag_search_results, + categoryId: self.get('categoryId'), + selected_tags: self.get('tags') + }; if (!self.get('everyTag')) { d.filterForInput = true; } diff --git a/app/assets/javascripts/discourse/models/tag-group.js.es6 b/app/assets/javascripts/discourse/models/tag-group.js.es6 index 6ab079c3734..67ee9b63e47 100644 --- a/app/assets/javascripts/discourse/models/tag-group.js.es6 +++ b/app/assets/javascripts/discourse/models/tag-group.js.es6 @@ -20,7 +20,9 @@ const TagGroup = RestModel.extend({ return Discourse.ajax(url, { data: { name: this.get('name'), - tag_names: this.get('tag_names') + tag_names: this.get('tag_names'), + parent_tag_name: this.get('parent_tag_name') ? this.get('parent_tag_name') : undefined, + one_per_topic: this.get('one_per_topic') }, type: this.get('id') ? 'PUT' : 'POST' }).then(function(result) { diff --git a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs index aec3ce6e51c..58b80d565e2 100644 --- a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs +++ b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs @@ -1,13 +1,25 @@

{{text-field value=model.name}}


-
- -
- {{tag-chooser tags=model.tag_names everyTag="false" unlimitedTagCount="true"}} -
-
+
+
+ {{tag-chooser tags=model.tag_names everyTag="true" unlimitedTagCount="true"}} +
+ +
+ + {{tag-chooser tags=model.parent_tag_name everyTag="true" limit="1" placeholderKey="tagging.groups.parent_tag_placeholder"}} + {{i18n 'tagging.groups.parent_tag_description'}} +
+ +
+ +
+ - + {{model.savingStatus}}
\ No newline at end of file diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss index 3d90c7709b5..ff4cf495b74 100644 --- a/app/assets/stylesheets/common/base/tagging.scss +++ b/app/assets/stylesheets/common/base/tagging.scss @@ -222,6 +222,14 @@ header .discourse-tag {color: $tag-color !important; } .tag-group-content { width: 75%; float: right; + section { + margin-bottom: 20px; + } + label { + font-size: 1em; + display: inline-block; + margin-right: 10px; + } } .group-tags-list .tag-chooser { height: 150px !important; @@ -233,4 +241,10 @@ header .discourse-tag {color: $tag-color !important; } .saving { margin-left: 20px; } + .parent-tag-section { + .tag-chooser { + width: 200px; + margin-right: 10px; + } + } } \ No newline at end of file diff --git a/app/controllers/tag_groups_controller.rb b/app/controllers/tag_groups_controller.rb index 4bfc943a160..36d955268fd 100644 --- a/app/controllers/tag_groups_controller.rb +++ b/app/controllers/tag_groups_controller.rb @@ -69,7 +69,10 @@ class TagGroupsController < ApplicationController end def tag_groups_params - params[:tag_names] ||= [] - params.permit(:id, :name, :tag_names => []) + result = params.permit(:id, :name, :one_per_topic, :tag_names => [], :parent_tag_name => []) + result[:tag_names] ||= [] + result[:parent_tag_name] ||= [] + result[:one_per_topic] = (params[:one_per_topic] == "true") + result end end diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 7fffed3b56e..a476c204db7 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -117,7 +117,12 @@ class TagsController < ::ApplicationController tags_with_counts = DiscourseTagging.filter_allowed_tags( self.class.tags_by_count(guardian, params.slice(:limit)), guardian, - { for_input: params[:filterForInput], term: params[:q], category: category } + { + for_input: params[:filterForInput], + term: params[:q], + category: category, + selected_tags: params[:selected_tags] + } ) tags = tags_with_counts.count.map {|t, c| { id: t, text: t, count: c } } @@ -125,7 +130,7 @@ class TagsController < ::ApplicationController unused_tags = DiscourseTagging.filter_allowed_tags( Tag.where(topic_count: 0), guardian, - { for_input: params[:filterForInput], term: params[:q], category: category } + { for_input: params[:filterForInput], term: params[:q], category: category, selected_tags: params[:selected_tags] } ) unused_tags.each do |t| diff --git a/app/models/tag_group.rb b/app/models/tag_group.rb index dea1199a62a..484619793b7 100644 --- a/app/models/tag_group.rb +++ b/app/models/tag_group.rb @@ -6,7 +6,19 @@ class TagGroup < ActiveRecord::Base has_many :category_tag_groups, dependent: :destroy has_many :categories, through: :category_tag_groups + belongs_to :parent_tag, class_name: 'Tag' + def tag_names=(tag_names_arg) DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg) end + + def parent_tag_name=(tag_names_arg) + if tag_names_arg.empty? + self.parent_tag = nil + else + if tag_name = DiscourseTagging.tags_for_saving(tag_names_arg, Guardian.new(Discourse.system_user)).first + self.parent_tag = Tag.find_by_name(tag_name) || Tag.create(name: tag_name) + end + end + end end diff --git a/app/models/tag_group_membership.rb b/app/models/tag_group_membership.rb index 0fee1fdcf60..eaa9c5178d8 100644 --- a/app/models/tag_group_membership.rb +++ b/app/models/tag_group_membership.rb @@ -1,4 +1,4 @@ class TagGroupMembership < ActiveRecord::Base belongs_to :tag - belongs_to :tag_group, counter_cache: "tag_count" + belongs_to :tag_group, counter_cache: "tag_count" # TODO: remove counter cache end diff --git a/app/serializers/tag_group_serializer.rb b/app/serializers/tag_group_serializer.rb index 0aa0f412d7d..560eef34bcd 100644 --- a/app/serializers/tag_group_serializer.rb +++ b/app/serializers/tag_group_serializer.rb @@ -1,7 +1,11 @@ class TagGroupSerializer < ApplicationSerializer - attributes :id, :name, :tag_names + attributes :id, :name, :tag_names, :parent_tag_name, :one_per_topic def tag_names object.tags.pluck(:name).sort end + + def parent_tag_name + [object.parent_tag.try(:name)].compact + end end diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index b7647e2b713..433b9c4a197 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -3015,6 +3015,10 @@ en: about: "Add tags to groups to manage them more easily." new: "New Group" tags_label: "Tags in this group:" + parent_tag_label: "Parent tag:" + parent_tag_placeholder: "Optional" + parent_tag_description: "Tags from this group can't be used unless the parent tag is present." + one_per_topic_label: "Limit one tag per topic from this group" new_name: "New Tag Group" save: "Save" delete: "Delete" diff --git a/db/migrate/20160607213656_add_tag_group_options.rb b/db/migrate/20160607213656_add_tag_group_options.rb new file mode 100644 index 00000000000..54f0c605073 --- /dev/null +++ b/db/migrate/20160607213656_add_tag_group_options.rb @@ -0,0 +1,6 @@ +class AddTagGroupOptions < ActiveRecord::Migration + def change + add_column :tag_groups, :parent_tag_id, :integer + add_column :tag_groups, :one_per_topic, :boolean, default: false + end +end diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb index 72ef4aecd11..f2bb6992134 100644 --- a/lib/discourse_tagging.rb +++ b/lib/discourse_tagging.rb @@ -33,7 +33,7 @@ module DiscourseTagging if tag_names.present? category = topic.category - tags = filter_allowed_tags(Tag.where(name: tag_names), guardian, { for_input: true, category: category }).to_a + tags = filter_allowed_tags(Tag.where(name: tag_names), guardian, { for_input: true, category: category, selected_tags: tag_names }).to_a if tags.size < tag_names.size && (category.nil? || category.tags.count == 0) tag_names.each do |name| @@ -56,8 +56,9 @@ module DiscourseTagging # Options: # term: a search term to filter tags by name - # for_input: result is for an input field, so only show permitted tags # category: a Category to which the object being tagged belongs + # for_input: result is for an input field, so only show permitted tags + # selected_tags: an array of tag names that are in the current selection def self.filter_allowed_tags(query, guardian, opts={}) term = opts[:term] if term.present? @@ -67,6 +68,8 @@ module DiscourseTagging end if opts[:for_input] + selected_tag_ids = opts[:selected_tags] ? Tag.where(name: opts[:selected_tags]).pluck(:id) : [] + unless guardian.is_staff? staff_tag_names = SiteSetting.staff_tags.split("|") query = query.where('tags.name NOT IN (?)', staff_tag_names) if staff_tag_names.present? @@ -74,20 +77,24 @@ module DiscourseTagging # Filters for category-specific tags: - if opts[:category] && (opts[:category].tags.count > 0 || opts[:category].tag_groups.count > 0) - if opts[:category].tags.count > 0 && opts[:category].tag_groups.count > 0 - tag_group_ids = opts[:category].tag_groups.pluck(:id) + category = opts[:category] + + if category && (category.tags.count > 0 || category.tag_groups.count > 0) + if category.tags.count > 0 && category.tag_groups.count > 0 + tag_group_ids = category.tag_groups.pluck(:id) + query = query.where( "tags.id IN (SELECT tag_id FROM category_tags WHERE category_id = ? UNION - SELECT tag_id FROM tag_group_memberships WHERE tag_group_id = ?)", - opts[:category].id, tag_group_ids + SELECT tag_id FROM tag_group_memberships WHERE tag_group_id IN (?))", + category.id, tag_group_ids ) - elsif opts[:category].tags.count > 0 - query = query.where("tags.id IN (SELECT tag_id FROM category_tags WHERE category_id = ?)", opts[:category].id) - else # opts[:category].tag_groups.count > 0 - tag_group_ids = opts[:category].tag_groups.pluck(:id) - query = query.where("tags.id IN (SELECT tag_id FROM tag_group_memberships WHERE tag_group_id = ?)", tag_group_ids) + elsif category.tags.count > 0 + query = query.where("tags.id IN (SELECT tag_id FROM category_tags WHERE category_id = ?)", category.id) + else # category.tag_groups.count > 0 + tag_group_ids = category.tag_groups.pluck(:id) + + query = query.where("tags.id IN (SELECT tag_id FROM tag_group_memberships WHERE tag_group_id IN (?))", tag_group_ids) end else # exclude tags that are restricted to other categories @@ -97,7 +104,41 @@ module DiscourseTagging if CategoryTagGroup.exists? tag_group_ids = CategoryTagGroup.pluck(:tag_group_id).uniq - query = query.where("tags.id NOT IN (SELECT tag_id FROM tag_group_memberships WHERE tag_group_id = ?)", tag_group_ids) + query = query.where("tags.id NOT IN (SELECT tag_id FROM tag_group_memberships WHERE tag_group_id IN (?))", tag_group_ids) + end + end + + # exclude tag groups that have a parent tag which is missing from selected_tags + + select_sql = <<-SQL + SELECT tag_id + FROM tag_group_memberships tgm + INNER JOIN tag_groups tg + ON tgm.tag_group_id = tg.id + SQL + + if selected_tag_ids.empty? + sql = "tags.id NOT IN (#{select_sql} WHERE tg.parent_tag_id IS NOT NULL)" + query = query.where(sql) + else + # One tag per group restriction + exclude_group_ids = TagGroup.where(one_per_topic: true) + .joins(:tag_group_memberships) + .where('tag_group_memberships.tag_id in (?)', selected_tag_ids) + .pluck(:id) + + if exclude_group_ids.empty? + sql = "tags.id NOT IN (#{select_sql} WHERE tg.parent_tag_id NOT IN (?))" + query = query.where(sql, selected_tag_ids) + else + # It's possible that the selected tags violate some one-tag-per-group restrictions, + # so filter them out by picking one from each group. + limit_tag_ids = TagGroupMembership.select('distinct on (tag_group_id) tag_id') + .where(tag_id: selected_tag_ids) + .where(tag_group_id: exclude_group_ids) + .map(&:tag_id) + sql = "(tags.id NOT IN (#{select_sql} WHERE (tg.parent_tag_id NOT IN (?) OR tg.id in (?))) OR tags.id IN (?))" + query = query.where(sql, selected_tag_ids, exclude_group_ids, limit_tag_ids) end end end diff --git a/spec/fabricators/tag_fabricator.rb b/spec/fabricators/tag_fabricator.rb index 45940081a1c..5c61060c832 100644 --- a/spec/fabricators/tag_fabricator.rb +++ b/spec/fabricators/tag_fabricator.rb @@ -1,3 +1,3 @@ Fabricator(:tag) do - name { sequence(:name) { |i| "tag#{i}" } } + name { sequence(:name) { |i| "tag#{i+1}" } } end diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb index 9b2f0c3a90d..047056cedc4 100644 --- a/spec/integration/category_tag_spec.rb +++ b/spec/integration/category_tag_spec.rb @@ -9,6 +9,10 @@ describe "category tag restrictions" do tag_records.map(&:name).sort end + def filter_allowed_tags(opts={}) + DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), opts) + end + let!(:tag1) { Fabricate(:tag) } let!(:tag2) { Fabricate(:tag) } let!(:tag3) { Fabricate(:tag) } @@ -40,9 +44,9 @@ describe "category tag restrictions" do end it "search can show only permitted tags" do - expect(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user)).count).to eq(Tag.count) - expect(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true, category: category_with_tags}).pluck(:name).sort).to eq([tag1.name, tag2.name].sort) - expect(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true}).pluck(:name).sort).to eq([tag3.name, tag4.name].sort) + expect(filter_allowed_tags.count).to eq(Tag.count) + expect(filter_allowed_tags({for_input: true, category: category_with_tags}).pluck(:name).sort).to eq([tag1.name, tag2.name].sort) + expect(filter_allowed_tags({for_input: true}).pluck(:name).sort).to eq([tag3.name, tag4.name].sort) end it "can't create new tags in a restricted category" do @@ -76,13 +80,13 @@ describe "category tag restrictions" do category.allowed_tag_groups = [tag_group1.name] category.reload - expect(sorted_tag_names(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true, category: category}))).to eq(sorted_tag_names([tag1, tag2])) - expect(sorted_tag_names(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true}))).to eq(sorted_tag_names([tag3, tag4])) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: category}))).to eq(sorted_tag_names([tag1, tag2])) + expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag3, tag4])) tag_group1.tags = [tag2, tag3, tag4] - expect(sorted_tag_names(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true, category: category}))).to eq(sorted_tag_names([tag2, tag3, tag4])) - expect(sorted_tag_names(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true}))).to eq(sorted_tag_names([tag1])) - expect(sorted_tag_names(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true, category: other_category}))).to eq(sorted_tag_names([tag1])) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: category}))).to eq(sorted_tag_names([tag2, tag3, tag4])) + expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag1])) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: other_category}))).to eq(sorted_tag_names([tag1])) end it "groups and individual tags can be mixed" do @@ -90,9 +94,92 @@ describe "category tag restrictions" do category.allowed_tags = [tag4.name] category.reload - expect(sorted_tag_names(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true, category: category}))).to eq(sorted_tag_names([tag1, tag2, tag4])) - expect(sorted_tag_names(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true}))).to eq(sorted_tag_names([tag3])) - expect(sorted_tag_names(DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), {for_input: true, category: other_category}))).to eq(sorted_tag_names([tag3])) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: category}))).to eq(sorted_tag_names([tag1, tag2, tag4])) + expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag3])) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: other_category}))).to eq(sorted_tag_names([tag3])) + end + end + + context "tag groups with parent tag" do + it "filter_allowed_tags returns results based on whether parent tag is present or not" do + tag_group = Fabricate(:tag_group, parent_tag_id: tag1.id) + tag_group.tags = [tag3, tag4] + expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag1, tag2])) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, selected_tags: [tag1.name]}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4])) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, selected_tags: [tag1.name, tag3.name]}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4])) + end + + context "and category restrictions" do + let(:car_category) { Fabricate(:category) } + let(:other_category) { Fabricate(:category) } + let(:makes) { Fabricate(:tag_group, name: "Makes") } + let(:honda_group) { Fabricate(:tag_group, name: "Honda Models") } + let(:ford_group) { Fabricate(:tag_group, name: "Ford Models") } + + before do + @tags = {} + ['honda', 'ford', 'civic', 'accord', 'mustang', 'taurus'].each do |name| + @tags[name] = Fabricate(:tag, name: name) + end + + makes.tags = [@tags['honda'], @tags['ford']] + + honda_group.parent_tag_id = @tags['honda'].id + honda_group.save + honda_group.tags = [@tags['civic'], @tags['accord']] + + ford_group.parent_tag_id = @tags['ford'].id + ford_group.save + ford_group.tags = [@tags['mustang'], @tags['taurus']] + + car_category.allowed_tag_groups = [makes.name, honda_group.name, ford_group.name] + end + + it "handles all those rules" do + # car tags can't be used outside of car category: + expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4])) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: other_category}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4])) + + # in car category, a make tag must be given first: + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category}))).to eq(['ford', 'honda']) + + # model tags depend on which make is chosen: + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['honda']}))).to eq(['accord', 'civic', 'ford', 'honda']) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['ford']}))).to eq(['ford', 'honda', 'mustang', 'taurus']) + end + + it "can apply the tags to a topic" do + post = create_post(category: car_category, tags: ['ford', 'mustang']) + expect(post.topic.tags.map(&:name).sort).to eq(['ford', 'mustang']) + end + + context "limit one tag from each group" do + before do + makes.update_attributes(one_per_topic: true) + honda_group.update_attributes(one_per_topic: true) + ford_group.update_attributes(one_per_topic: true) + end + + it "can restrict one tag from each group" do + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category}))).to eq(['ford', 'honda']) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['honda']}))).to eq(['accord', 'civic', 'honda']) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['ford']}))).to eq(['ford', 'mustang', 'taurus']) + expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['ford', 'mustang']}))).to eq(['ford', 'mustang']) + end + + it "can apply the tags to a topic" do + post = create_post(category: car_category, tags: ['ford', 'mustang']) + expect(post.topic.tags.map(&:name).sort).to eq(['ford', 'mustang']) + end + + it "can remove extra tags from the same group" do + # A weird case that input field wouldn't allow. + # Only one tag from car makers is allowed, but we're saying that two have been selected. + names = filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['honda', 'ford']}).map(&:name) + expect(names.include?('honda') && names.include?('ford')).to eq(false) + expect(names.include?('honda') || names.include?('ford')).to eq(true) + end + end end end end From addf4822e31a670b24e69f3abb7e7e815f6e1833 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 9 Jun 2016 16:32:19 -0400 Subject: [PATCH 262/320] FIX: max_tags_per_topic should not limit how many tags can be in a group --- app/models/tag_group.rb | 2 +- lib/discourse_tagging.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/tag_group.rb b/app/models/tag_group.rb index 484619793b7..8f3f9c18555 100644 --- a/app/models/tag_group.rb +++ b/app/models/tag_group.rb @@ -9,7 +9,7 @@ class TagGroup < ActiveRecord::Base belongs_to :parent_tag, class_name: 'Tag' def tag_names=(tag_names_arg) - DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg) + DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg, unlimited: true) end def parent_tag_name=(tag_names_arg) diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb index f2bb6992134..f2dcb6b146b 100644 --- a/lib/discourse_tagging.rb +++ b/lib/discourse_tagging.rb @@ -166,7 +166,7 @@ module DiscourseTagging tag_diff.present? ? tag_diff : nil end - def self.tags_for_saving(tags, guardian) + def self.tags_for_saving(tags, guardian, opts={}) return [] unless guardian.can_tag_topics? @@ -181,11 +181,11 @@ module DiscourseTagging tag_names = Tag.where(name: tag_names).pluck(:name) end - return tag_names[0...SiteSetting.max_tags_per_topic] + return opts[:unlimited] ? tag_names : tag_names[0...SiteSetting.max_tags_per_topic] end - def self.add_or_create_tags_by_name(taggable, tag_names_arg) - tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, Guardian.new(Discourse.system_user)) || [] + def self.add_or_create_tags_by_name(taggable, tag_names_arg, opts={}) + tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, Guardian.new(Discourse.system_user), opts) || [] if taggable.tags.pluck(:name).sort != tag_names.sort taggable.tags = Tag.where(name: tag_names).all if taggable.tags.size < tag_names.size From d7622f0665f63b2f07da0a6e6063e00ff66f78a4 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 9 Jun 2016 16:50:09 -0400 Subject: [PATCH 263/320] remove unused broken tag_count column --- app/models/tag_group_membership.rb | 2 +- .../20160609203508_remove_tag_count_from_tag_groups.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20160609203508_remove_tag_count_from_tag_groups.rb diff --git a/app/models/tag_group_membership.rb b/app/models/tag_group_membership.rb index eaa9c5178d8..eecc2966ab3 100644 --- a/app/models/tag_group_membership.rb +++ b/app/models/tag_group_membership.rb @@ -1,4 +1,4 @@ class TagGroupMembership < ActiveRecord::Base belongs_to :tag - belongs_to :tag_group, counter_cache: "tag_count" # TODO: remove counter cache + belongs_to :tag_group end diff --git a/db/migrate/20160609203508_remove_tag_count_from_tag_groups.rb b/db/migrate/20160609203508_remove_tag_count_from_tag_groups.rb new file mode 100644 index 00000000000..e6e73949be8 --- /dev/null +++ b/db/migrate/20160609203508_remove_tag_count_from_tag_groups.rb @@ -0,0 +1,5 @@ +class RemoveTagCountFromTagGroups < ActiveRecord::Migration + def change + remove_column :tag_groups, :tag_count + end +end From 8b5dfeb18fc99290aa48e4f2986173b5b0204f58 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 9 Jun 2016 16:38:41 -0700 Subject: [PATCH 264/320] ignore a few more common meaningless JS errs --- .gitignore | 1 + config/initializers/100-logster.rb | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fcdaca12caa..d88f2ca1642 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ config/version.rb bundler_stubs/* vendor/bundle/* +*.db diff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rb index e237d6aa75e..be4191583c3 100644 --- a/config/initializers/100-logster.rb +++ b/config/initializers/100-logster.rb @@ -28,11 +28,17 @@ if Rails.env.production? # suppress unconditionally for now /^Can't verify CSRF token authenticity$/, - # 404s can be dealt with elsewise - /^ActiveRecord::RecordNotFound /, + # Yandex bot triggers this JS error a lot + /^Uncaught ReferenceError: I18n is not defined/, + + # related to browser plugins somehow, we don't care + /Error calling method on NPObject/, + + # 404s can be dealt with elsewhere + /^ActiveRecord::RecordNotFound/, # bad asset requested, no need to log - /^ActionController::BadRequest / + /^ActionController::BadRequest/ ] end From a4e705648b7c53ed34941b652ac0626ecca6477a Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 9 Jun 2016 17:38:49 -0700 Subject: [PATCH 265/320] "digest" is now "summary" --- config/locales/server.en.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 5f035a6fe01..b85c82744b1 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -621,8 +621,8 @@ en: description: "You have been unsubscribed. We won't contact you again!" oops: "In case you didn't mean to do this, click below." error: "Error Unsubscribing" - preferences_link: "You can also unsubscribe from digest emails on your preferences page" - different_user_description: "You are currently logged in as a different user than the one who the digest was mailed to. Please log out and try again." + preferences_link: "You can also unsubscribe from summary emails on your preferences page" + different_user_description: "You are currently logged in as a different user than the one who the summary was mailed to. Please log out and try again." not_found_description: "Sorry, we couldn't unsubscribe you. It's possible the link in your email has expired." resubscribe: @@ -850,7 +850,7 @@ en: onebox_domains_whitelist: "A list of domains to allow oneboxing for; these domains should support OpenGraph or oEmbed. Test them at http://iframely.com/debug" logo_url: "The logo image at the top left of your site, should be a wide rectangle shape. If left blank site title text will be shown." - digest_logo_url: "The alternate logo image used at the top of your site's email digest. Should be a wide rectangle shape. Should not be an SVG image. If left blank `logo_url` will be used." + digest_logo_url: "The alternate logo image used at the top of your site's email summary. Should be a wide rectangle shape. Should not be an SVG image. If left blank `logo_url` will be used." logo_small_url: "The small logo image at the top left of your site, should be a square shape, seen when scrolling down. If left blank a home glyph will be shown." favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon, to work correctly over a CDN it must be a png" mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. Should be a square shape. If left blank, `logo_url` will be used. eg: http://example.com/uploads/default/logo.png" @@ -1220,11 +1220,11 @@ en: allow_animated_thumbnails: "Generates animated thumbnails of animated gifs." default_avatars: "URLs to avatars that will be used by default for new users until they change them." automatically_download_gravatars: "Download Gravatars for users upon account creation or email change." - digest_topics: "The maximum number of topics to display in the email digest." - digest_min_excerpt_length: "Minimum post excerpt in the email digest, in characters." - delete_digest_email_after_days: "Suppress digest emails for users not seen on the site for more than (n) days." - digest_suppress_categories: "Suppress these categories from digest emails." - disable_digest_emails: "Disable digest emails for all users." + digest_topics: "The maximum number of topics to display in the email summary." + digest_min_excerpt_length: "Minimum post excerpt in the email summary, in characters." + delete_digest_email_after_days: "Suppress summary emails for users not seen on the site for more than (n) days." + digest_suppress_categories: "Suppress these categories from summary emails." + disable_digest_emails: "Disable summary emails for all users." detect_custom_avatars: "Whether or not to check that users have uploaded custom profile pictures." max_daily_gravatar_crawls: "Maximum number of times Discourse will check Gravatar for custom avatars in a day" @@ -1307,8 +1307,8 @@ en: auto_close_messages_post_count: "Maximum number of posts allowed in a message before it is automatically closed (0 to disable)" auto_close_topics_post_count: "Maximum number of posts allowed in a topic before it is automatically closed (0 to disable)" - default_email_digest_frequency: "How often users receive digest emails by default." - default_include_tl0_in_digests: "Include posts from new users in digest emails by default. Users can change this in their preferences." + default_email_digest_frequency: "How often users receive summary emails by default." + default_include_tl0_in_digests: "Include posts from new users in summary emails by default. Users can change this in their preferences." default_email_private_messages: "Send an email when someone messages the user by default." default_email_direct: "Send an email when someone quotes/replies to/mentions or invites the user by default." default_email_mailing_list_mode: "Send an email for every new post by default." @@ -2339,13 +2339,13 @@ en: digest: why: "A brief summary of %{site_link} since your last visit on %{last_seen_at}" - subject_template: "[%{site_name}] Digest" + subject_template: "[%{site_name}] Summary" new_activity: "New activity on your topics and posts:" top_topics: "Popular posts" other_new_topics: "Popular topics" - unsubscribe: "This digest is sent from %{site_link} when we haven't seen you in a while. To unsubscribe %{unsubscribe_link}." + unsubscribe: "This summary is sent from %{site_link} when we haven't seen you in a while. To unsubscribe %{unsubscribe_link}." click_here: "click here" - from: "%{site_name} digest" + from: "%{site_name} summary" read_more: "Read More" more_topics: "There were %{new_topics_since_seen} other new topics." more_topics_category: "More new topics:" From 3015030fe21a120f42aadcdd14e84cb3e964f873 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 10 Jun 2016 10:53:03 +1000 Subject: [PATCH 266/320] FIX: unlisted topics do not get "slug auto correct" logic --- app/controllers/topics_controller.rb | 11 +++++++++-- spec/controllers/topics_controller_spec.rb | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 0d1681c9a31..1b58942aba4 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -65,7 +65,7 @@ class TopicsController < ApplicationController rescue Discourse::NotFound if params[:id] topic = Topic.find_by(slug: params[:id].downcase) - return redirect_to_correct_topic(topic, opts[:post_number]) if topic + return redirect_to_correct_topic(topic, opts[:post_number]) if topic && topic.visible end raise Discourse::NotFound end @@ -77,7 +77,14 @@ class TopicsController < ApplicationController discourse_expires_in 1.minute - redirect_to_correct_topic(@topic_view.topic, opts[:post_number]) && return if slugs_do_not_match || (!request.format.json? && params[:slug].nil?) + if !@topic_view.topic.visible && @topic_view.topic.slug != params[:slug] + raise Discourse::NotFound + end + + if slugs_do_not_match || (!request.format.json? && params[:slug].nil?) + redirect_to_correct_topic(@topic_view.topic, opts[:post_number]) + return + end track_visit_to_topic diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb index 780e6f4a487..e66a8085c5e 100644 --- a/spec/controllers/topics_controller_spec.rb +++ b/spec/controllers/topics_controller_spec.rb @@ -532,6 +532,22 @@ describe TopicsController do end end + describe 'show unlisted' do + it 'returns 404 unless exact correct URL' do + topic = Fabricate(:topic, visible: false) + Fabricate(:post, topic: topic) + + xhr :get, :show, topic_id: topic.id, slug: topic.slug + expect(response).to be_success + + xhr :get, :show, topic_id: topic.id, slug: "just-guessing" + expect(response.code).to eq("404") + + xhr :get, :show, id: topic.slug + expect(response.code).to eq("404") + end + end + describe 'show' do let(:topic) { Fabricate(:post).topic } From 30e4b17de8d6ccb3c9dd328476c1a043d0971199 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 10 Jun 2016 13:07:35 +1000 Subject: [PATCH 267/320] UX: strip outgoing links from bottom of post. Only show incoming --- .../discourse/widgets/post-links.js.es6 | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/post-links.js.es6 b/app/assets/javascripts/discourse/widgets/post-links.js.es6 index 50624d0e0a3..ca17d358c4b 100644 --- a/app/assets/javascripts/discourse/widgets/post-links.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-links.js.es6 @@ -20,37 +20,42 @@ export default createWidget('post-links', { return h('li', h('a.track-link', { - className: link.reflection ? 'inbound' : 'outbound', + className: 'inbound', attributes: { href: link.url } - }, [iconNode(link.reflection ? 'arrow-left' : 'arrow-right'), linkBody]) + }, [iconNode('arrow-left'), linkBody]) ); }, html(attrs, state) { - const links = this.attrs.links || []; - const dedupedLinks = _.uniq(links, true, l => l.title); - const incomingLinks = dedupedLinks.filter(l => l.reflection); + if (!this.attrs.links || this.attrs.links.length == 0) { + // shortcut all work + return; + } - // if all links are outgoing, don't show any - if (incomingLinks.length === 0) { return; } + // only show incoming + const links = _(this.attrs.links) + .filter(l => l.reflection) + .uniq(true, l => l.title) + .value(); + + if (links.length === 0) { return; } const result = []; // show all links - if (dedupedLinks.length <= 5 || !state.collapsed) { - _.each(dedupedLinks, l => result.push(this.linkHtml(l))); + if (links.length <= 5 || !state.collapsed) { + _.each(links, l => result.push(this.linkHtml(l))); } else { - // show up to 5 *incoming* links when collapsed - const max = Math.min(5, incomingLinks.length); + const max = Math.min(5, links.length); for (let i = 0; i < max; i++) { - result.push(this.linkHtml(incomingLinks[i])); + result.push(this.linkHtml(links[i])); } // 'show more' link - if (dedupedLinks.length > max) { + if (links.length > max) { result.push(h('li', this.attach('link', { labelCount: 'post_links.title', title: 'post_links.about', - count: dedupedLinks.length - max, + count: links.length - max, action: 'expandLinks', className: 'expand-links' }))); From a496574e933d6af1ef0590f26180fefbc71e18fb Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 10 Jun 2016 11:40:21 +0800 Subject: [PATCH 268/320] Make eslint happy. --- app/assets/javascripts/discourse/widgets/post-links.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/post-links.js.es6 b/app/assets/javascripts/discourse/widgets/post-links.js.es6 index ca17d358c4b..8aa84650fcd 100644 --- a/app/assets/javascripts/discourse/widgets/post-links.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-links.js.es6 @@ -27,7 +27,7 @@ export default createWidget('post-links', { }, html(attrs, state) { - if (!this.attrs.links || this.attrs.links.length == 0) { + if (!this.attrs.links || this.attrs.links.length === 0) { // shortcut all work return; } From 65f466cf8c863631e00e371778bf588e10dd204e Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 10 Jun 2016 17:24:30 +1000 Subject: [PATCH 269/320] FIX: topic link reflections deleted on second save --- app/models/topic_link.rb | 14 +++++++++++- spec/models/topic_link_spec.rb | 39 +++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index 516f9505dcf..786c5e625d4 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -178,7 +178,17 @@ class TopicLink < ActiveRecord::Base prefix = Discourse.base_url_no_prefix reflected_url = "#{prefix}#{post.topic.relative_url(post.post_number)}" - tl = TopicLink.create(user_id: post.user_id, + + tl = TopicLink.find_by(topic_id: topic_id, + post_id: reflected_post.try(:id), + url: reflected_url) + + if tl + tl.update_columns(domain: Discourse.current_hostname, + link_topic_id: post.topic.id, + link_post_id: post.id) + else + tl = TopicLink.create(user_id: post.user_id, topic_id: topic_id, post_id: reflected_post.try(:id), url: reflected_url, @@ -188,6 +198,8 @@ class TopicLink < ActiveRecord::Base link_topic_id: post.topic_id, link_post_id: post.id) + end + reflected_ids << tl.try(:id) end end diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb index 7ce59822d44..487c6852f30 100644 --- a/spec/models/topic_link_spec.rb +++ b/spec/models/topic_link_spec.rb @@ -92,27 +92,32 @@ http://b.com/#{'a'*500} topic.posts.create(user: user, raw: 'initial post') linked_post = topic.posts.create(user: user, raw: "Link to another topic: #{url}") - TopicLink.extract_from(linked_post) + # this is subtle, but we had a bug were second time + # TopicLink.extract_from was called a reflection was nuked + 2.times do + topic.reload + TopicLink.extract_from(linked_post) - link = topic.topic_links.first - expect(link).to be_present - expect(link).to be_internal - expect(link.url).to eq(url) - expect(link.domain).to eq(test_uri.host) - link.link_topic_id == other_topic.id - expect(link).not_to be_reflection + link = topic.topic_links.first + expect(link).to be_present + expect(link).to be_internal + expect(link.url).to eq(url) + expect(link.domain).to eq(test_uri.host) + link.link_topic_id == other_topic.id + expect(link).not_to be_reflection - reflection = other_topic.topic_links.first + reflection = other_topic.topic_links.first - expect(reflection).to be_present - expect(reflection).to be_reflection - expect(reflection.post_id).to be_present - expect(reflection.domain).to eq(test_uri.host) - expect(reflection.url).to eq("http://#{test_uri.host}/t/unique-topic-name/#{topic.id}/#{linked_post.post_number}") - expect(reflection.link_topic_id).to eq(topic.id) - expect(reflection.link_post_id).to eq(linked_post.id) + expect(reflection).to be_present + expect(reflection).to be_reflection + expect(reflection.post_id).to be_present + expect(reflection.domain).to eq(test_uri.host) + expect(reflection.url).to eq("http://#{test_uri.host}/t/unique-topic-name/#{topic.id}/#{linked_post.post_number}") + expect(reflection.link_topic_id).to eq(topic.id) + expect(reflection.link_post_id).to eq(linked_post.id) - expect(reflection.user_id).to eq(link.user_id) + expect(reflection.user_id).to eq(link.user_id) + end linked_post.revise(post.user, { raw: "no more linkies https://eviltrout.com" }) expect(other_topic.topic_links.where(link_post_id: linked_post.id)).to be_blank From 9e75b14535b401346ac6547d883d9b3901407eec Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 10 Jun 2016 17:25:37 +1000 Subject: [PATCH 270/320] update is not really needed --- app/models/topic_link.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index 786c5e625d4..08114bfaecf 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -183,11 +183,7 @@ class TopicLink < ActiveRecord::Base post_id: reflected_post.try(:id), url: reflected_url) - if tl - tl.update_columns(domain: Discourse.current_hostname, - link_topic_id: post.topic.id, - link_post_id: post.id) - else + unless tl tl = TopicLink.create(user_id: post.user_id, topic_id: topic_id, post_id: reflected_post.try(:id), From dffe50a2e6cccb31a54bffae55ad94f6fb71f293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 10 Jun 2016 16:14:42 +0200 Subject: [PATCH 271/320] new alternative reply by email addresses --- config/locales/server.en.yml | 2 ++ config/site_settings.yml | 4 +++- lib/email/receiver.rb | 21 +++++++++++++----- ...tive_reply_by_email_addresses_validator.rb | 16 +++++++++++++ .../reply_by_email_address_validator.rb | 6 ++--- spec/components/email/receiver_spec.rb | 1 + spec/fixtures/emails/html_reply.eml | Bin 340 -> 338 bytes 7 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 lib/validators/alternative_reply_by_email_addresses_validator.rb diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index b85c82744b1..2ab37f4dc2c 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1171,6 +1171,7 @@ en: reply_by_email_enabled: "Enable replying to topics via email." reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com" + alternative_reply_by_email_addresses: "List of alternative templates for reply by email incoming email addresses." incoming_email_prefer_html: "Use the HTML instead of the text for incoming email. May cause unexcpeted formatting issues!" disable_emails: "Prevent Discourse from sending any kind of emails" @@ -1363,6 +1364,7 @@ en: invalid_string_min: "Must be at least %{min} characters." invalid_string_max: "Must be no more than %{max} characters." invalid_reply_by_email_address: "Value must contain '%{reply_key}' and be different from the notification email." + invalid_alternative_reply_by_email_addresses: "All values must contain '%{reply_key}' and be different from the notification email." pop3_polling_host_is_empty: "You must set a 'pop3 polling host' before enabling POP3 polling." pop3_polling_username_is_empty: "You must set a 'pop3 polling username' before enabling POP3 polling." pop3_polling_password_is_empty: "You must set a 'pop3 polling password' before enabling POP3 polling." diff --git a/config/site_settings.yml b/config/site_settings.yml index 1f9fddf2bb2..2d5b7f45c11 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -534,7 +534,9 @@ email: validator: "ReplyByEmailEnabledValidator" reply_by_email_address: default: '' - validator: "ReplyByEmailAddressValidator" + validator: "AlternativeReplyByEmailAddressesValidator" + alternative_reply_by_email_addresses: + default: '' manual_polling_enabled: default: false pop3_polling_enabled: diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index 5d9b5d16258..36b0dc484b1 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -327,15 +327,26 @@ module Email # reply match = reply_by_email_address_regex.match(address) - if match && match[1].present? - email_log = EmailLog.for(match[1]) - return { type: :reply, obj: email_log } if email_log + if match && match.captures + match.captures.each do |c| + next if c.blank? + email_log = EmailLog.for(c) + return { type: :reply, obj: email_log } if email_log + end end end def reply_by_email_address_regex - @reply_by_email_address_regex ||= Regexp.new Regexp.escape(SiteSetting.reply_by_email_address) - .gsub(Regexp.escape("%{reply_key}"), "([[:xdigit:]]{32})") + @reply_by_email_address_regex ||= begin + reply_addresses = [ + SiteSetting.reply_by_email_address, + *SiteSetting.alternative_reply_by_email_addresses.split("|") + ] + escaped_reply_addresses = reply_addresses.select { |a| a.present? } + .map { |a| Regexp.escape(a) } + .map { |a| a.gsub(Regexp.escape("%{reply_key}"), "([[:xdigit:]]{32})") } + Regexp.new(escaped_reply_addresses.join("|")) + end end def group_incoming_emails_regex diff --git a/lib/validators/alternative_reply_by_email_addresses_validator.rb b/lib/validators/alternative_reply_by_email_addresses_validator.rb new file mode 100644 index 00000000000..d35dedf7c3a --- /dev/null +++ b/lib/validators/alternative_reply_by_email_addresses_validator.rb @@ -0,0 +1,16 @@ +class AlternativeReplyByEmailAddressesValidator + def initialize(opts={}) + @opts = opts + end + + def valid_value?(val) + return true if val.blank? + + validator = ReplyByEmailAddressValidator.new(@opts) + val.split("|").all? { |v| validator.valid_value?(v) } + end + + def error_message + I18n.t('site_settings.errors.invalid_alternative_reply_by_email_addresses') + end +end diff --git a/lib/validators/reply_by_email_address_validator.rb b/lib/validators/reply_by_email_address_validator.rb index f5c19d2bdb1..024a1aab707 100644 --- a/lib/validators/reply_by_email_address_validator.rb +++ b/lib/validators/reply_by_email_address_validator.rb @@ -6,9 +6,9 @@ class ReplyByEmailAddressValidator def valid_value?(val) return true if val.blank? - !!(val =~ /@/i) && - !!(val =~ /%{reply_key}/i) && - val.gsub(/\+?%{reply_key}/i, "") != SiteSetting.notification_email + !!val["@"] && + !!val["%{reply_key}"] && + val.gsub(/\+?%{reply_key}/, "") != SiteSetting.notification_email end def error_message diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb index 7a802acd1de..533eea27ec3 100644 --- a/spec/components/email/receiver_spec.rb +++ b/spec/components/email/receiver_spec.rb @@ -6,6 +6,7 @@ describe Email::Receiver do before do SiteSetting.email_in = true SiteSetting.reply_by_email_address = "reply+%{reply_key}@bar.com" + SiteSetting.alternative_reply_by_email_addresses = "alt+%{reply_key}@bar.com" end def process(email_name) diff --git a/spec/fixtures/emails/html_reply.eml b/spec/fixtures/emails/html_reply.eml index 28e5feff851f334c4b26a78c1da25df3cc0c480b..2f4ac8f344c5fa45e968eba696b63c07c2cc5285 100644 GIT binary patch delta 14 Vcmcb@bctz#J9A=A$wnUzMgS=h1k3;c delta 16 Xcmcb_bcJbxJ8MyDK~CjHFAhckHPHpP From eff28652782b312c3ae69cf27470bc17575814fa Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 10 Jun 2016 11:12:46 -0400 Subject: [PATCH 272/320] FIX: Support create account on facebook browser --- .../discourse/initializers/auth-complete.js.es6 | 13 +++++++++++++ .../users/omniauth_callbacks/complete.html.erb | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/discourse/initializers/auth-complete.js.es6 diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 new file mode 100644 index 00000000000..613d03fd115 --- /dev/null +++ b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 @@ -0,0 +1,13 @@ +export default { + name: "auth-complete", + after: "inject-objects", + initialize() { + if (window.location.search.indexOf('authComplete=true') !== -1) { + const lastAuthResult = localStorage.getItem('lastAuthResult'); + if (lastAuthResult) { + Discourse.authenticationComplete(JSON.parse(lastAuthResult)); + } + } + } +}; + diff --git a/app/views/users/omniauth_callbacks/complete.html.erb b/app/views/users/omniauth_callbacks/complete.html.erb index 07bd7014636..4d7f5dd9ecb 100644 --- a/app/views/users/omniauth_callbacks/complete.html.erb +++ b/app/views/users/omniauth_callbacks/complete.html.erb @@ -22,12 +22,15 @@

<%=t "login.close_window" %>

From 3b9b492ea6652894184fdea55ab68240a084522d Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 10 Jun 2016 11:32:32 -0400 Subject: [PATCH 273/320] FIX: Weird spec --- spec/views/omniauth_callbacks/complete.html.erb_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/views/omniauth_callbacks/complete.html.erb_spec.rb b/spec/views/omniauth_callbacks/complete.html.erb_spec.rb index ba571e07808..614877fdb89 100644 --- a/spec/views/omniauth_callbacks/complete.html.erb_spec.rb +++ b/spec/views/omniauth_callbacks/complete.html.erb_spec.rb @@ -6,7 +6,7 @@ require_dependency "auth/result" describe "users/omniauth_callbacks/complete.html.erb" do let :rendered_data do - returned = JSON.parse(rendered.match(/window.opener.Discourse.authenticationComplete\((.*)\)/)[1]) + JSON.parse(rendered.match(/var authResult = (.*);/)[1]) end it "renders auth info" do From 33a418d5370f1d459b3a47df42573f366fd95830 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 10 Jun 2016 12:05:14 -0400 Subject: [PATCH 274/320] Log errors authenticating with facebook --- .../discourse/initializers/auth-complete.js.es6 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 index 613d03fd115..77906736220 100644 --- a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 +++ b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 @@ -5,7 +5,12 @@ export default { if (window.location.search.indexOf('authComplete=true') !== -1) { const lastAuthResult = localStorage.getItem('lastAuthResult'); if (lastAuthResult) { - Discourse.authenticationComplete(JSON.parse(lastAuthResult)); + try { + Discourse.authenticationComplete(JSON.parse(lastAuthResult)); + } catch(e) { + document.write(`

lastAuthResult: ${lastAuthResult}

`); + document.write(e); + } } } } From 28e3becf441c3f64099c57af7559defddcb69b02 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 10 Jun 2016 12:24:34 -0400 Subject: [PATCH 275/320] FIX: Allow authentication complete window to pop up --- .../discourse/initializers/auth-complete.js.es6 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 index 77906736220..9ce53431563 100644 --- a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 +++ b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 @@ -5,12 +5,7 @@ export default { if (window.location.search.indexOf('authComplete=true') !== -1) { const lastAuthResult = localStorage.getItem('lastAuthResult'); if (lastAuthResult) { - try { - Discourse.authenticationComplete(JSON.parse(lastAuthResult)); - } catch(e) { - document.write(`

lastAuthResult: ${lastAuthResult}

`); - document.write(e); - } + Ember.run.next(() => Discourse.authenticationComplete(JSON.parse(lastAuthResult))); } } } From 9ecd5bd59968758ef58830ef76927f4483f45c51 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Fri, 10 Jun 2016 13:41:22 -0400 Subject: [PATCH 276/320] Version bump to v1.6.0.beta8 --- lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.rb b/lib/version.rb index 3b9b3c2a34a..1936907b9c0 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 6 TINY = 0 - PRE = 'beta7' + PRE = 'beta8' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end From a77f5a75a1b8548b6c9b83afa67ab3aa3c6a70a1 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 10 Jun 2016 14:14:08 -0400 Subject: [PATCH 277/320] FIX: Scroll jumping in some dimensions of browser --- .../discourse/widgets/post-stream.js.es6 | 16 +++++++++------- .../javascripts/discourse/widgets/post.js.es6 | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 b/app/assets/javascripts/discourse/widgets/post-stream.js.es6 index 704b671f246..9488cf7686a 100644 --- a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-stream.js.es6 @@ -8,6 +8,7 @@ const DAY = 1000 * 60 * 60 * 24; const _dontCloak = {}; let _cloaked = {}; +let _heights = {}; export function preventCloak(postId) { _dontCloak[postId] = true; @@ -17,7 +18,8 @@ export function cloak(post, component) { if (!CLOAKING_ENABLED || _cloaked[post.id] || _dontCloak[post.id]) { return; } const $post = $(`#post_${post.post_number}`); - _cloaked[post.id] = $post.outerHeight(); + _cloaked[post.id] = true; + _heights[post.id] = $post.outerHeight(); Ember.run.debounce(component, 'queueRerender', 1000); } @@ -27,7 +29,10 @@ export function uncloak(post, component) { component.queueRerender(); } -addWidgetCleanCallback('post-stream', () => _cloaked = {}); +addWidgetCleanCallback('post-stream', () => { + _cloaked = {}; + _heights = {}; +}); export default createWidget('post-stream', { tagName: 'div.post-stream', @@ -88,11 +93,8 @@ export default createWidget('post-stream', { } prevDate = curTime; - const height = _cloaked[post.id]; - if (height) { - transformed.cloaked = true; - transformed.height = height; - } + transformed.height = _heights[post.id]; + transformed.cloaked = _cloaked[post.id]; if (transformed.isSmallAction) { result.push(this.attach('post-small-action', transformed, { model: post })); diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6 index 506e9dab7b7..2ba179a9e80 100644 --- a/app/assets/javascripts/discourse/widgets/post.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post.js.es6 @@ -384,7 +384,7 @@ export default createWidget('post', { shadowTree: true, buildAttributes(attrs) { - return attrs.cloaked ? { style: `height: ${attrs.height}px` } : undefined; + return attrs.height ? { style: `height: ${attrs.height}px` } : undefined; }, buildId(attrs) { From d1c59499228712eaaf6e59d636b2ceeb989c33b6 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 10 Jun 2016 16:09:10 -0700 Subject: [PATCH 278/320] switch to dual-way arrow for links --- app/assets/javascripts/discourse/widgets/post-links.js.es6 | 2 +- config/locales/client.en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/post-links.js.es6 b/app/assets/javascripts/discourse/widgets/post-links.js.es6 index 8aa84650fcd..f7b621a5072 100644 --- a/app/assets/javascripts/discourse/widgets/post-links.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-links.js.es6 @@ -22,7 +22,7 @@ export default createWidget('post-links', { h('a.track-link', { className: 'inbound', attributes: { href: link.url } - }, [iconNode('arrow-left'), linkBody]) + }, [iconNode('arrows-h'), linkBody]) ); }, diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 433b9c4a197..7c4c6c749e0 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1083,7 +1083,7 @@ en: invited_to_topic: "

{{username}} {{description}}

" invitee_accepted: "

{{username}} accepted your invitation

" moved_post: "

{{username}} moved {{description}}

" - linked: "

{{username}} {{description}}

" + linked: "

{{username}} {{description}}

" granted_badge: "

Earned '{{description}}'

" group_message_summary: From c0e25b5a9a9449f128672cbc7e1fde20c03efc84 Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 10 Jun 2016 21:37:33 -0500 Subject: [PATCH 279/320] Replace certain uses of 'gsub' with 'tr' or 'chomp' for a speed improvement --- app/controllers/application_controller.rb | 11 +++++------ app/helpers/application_helper.rb | 2 +- app/mailers/invite_mailer.rb | 2 +- app/mailers/user_notifications.rb | 2 +- app/models/badge.rb | 2 +- app/models/topic_status_update.rb | 2 +- lib/email/sender.rb | 4 ++-- lib/ip_addr.rb | 2 +- lib/slug.rb | 4 ++-- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2db84795883..5ac4811442c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -296,13 +296,12 @@ class ApplicationController < ActionController::Base def fetch_user_from_params(opts=nil) opts ||= {} user = if params[:username] - username_lower = params[:username].downcase - username_lower.gsub!(/\.json$/, '') + username_lower = params[:username].downcase.chomp('.json') find_opts = { username_lower: username_lower } find_opts[:active] = true unless opts[:include_inactive] || current_user.try(:staff?) User.find_by(find_opts) elsif params[:external_id] - external_id = params[:external_id].gsub(/\.json$/, '') + external_id = params[:external_id].chomp('.json') SingleSignOnRecord.find_by(external_id: external_id).try(:user) end raise Discourse::NotFound if user.blank? @@ -335,9 +334,9 @@ class ApplicationController < ActionController::Base # Rails I18n uses underscores between the locale and the region; the request # headers use hyphens. require 'http_accept_language' unless defined? HttpAcceptLanguage - available_locales = I18n.available_locales.map { |locale| locale.to_s.gsub(/_/, '-') } + available_locales = I18n.available_locales.map { |locale| locale.to_s.tr('_', '-') } parser = HttpAcceptLanguage::Parser.new(request.env["HTTP_ACCEPT_LANGUAGE"]) - parser.language_region_compatible_from(available_locales).gsub(/-/, '_') + parser.language_region_compatible_from(available_locales).tr('-', '_') rescue # If Accept-Language headers are not set. I18n.default_locale @@ -493,7 +492,7 @@ class ApplicationController < ActionController::Base @recent = Topic.where.not(id: category_topic_ids).recent(10) @slug = params[:slug].class == String ? params[:slug] : '' @slug = (params[:id].class == String ? params[:id] : '') if @slug.blank? - @slug.gsub!('-',' ') + @slug.tr!('-',' ') render_to_string status: status, layout: layout, formats: [:html], template: '/exceptions/not_found' end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4b6808962cc..c5160585f12 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -38,7 +38,7 @@ module ApplicationHelper def script(*args) if SiteSetting.enable_cdn_js_debugging && GlobalSetting.cdn_url tags = javascript_include_tag(*args, "crossorigin" => "anonymous") - tags.gsub!("/assets/", "/cdn_asset/#{Discourse.current_hostname.gsub(".","_")}/") + tags.gsub!("/assets/", "/cdn_asset/#{Discourse.current_hostname.tr(".","_")}/") tags.gsub!(".js\"", ".js?v=1&origin=#{CGI.escape request.base_url}\"") tags.html_safe else diff --git a/app/mailers/invite_mailer.rb b/app/mailers/invite_mailer.rb index f94aca2eb65..346507326fc 100644 --- a/app/mailers/invite_mailer.rb +++ b/app/mailers/invite_mailer.rb @@ -22,7 +22,7 @@ class InviteMailer < ActionMailer::Base # get topic excerpt topic_excerpt = "" if first_topic.excerpt - topic_excerpt = first_topic.excerpt.gsub("\n", " ") + topic_excerpt = first_topic.excerpt.tr("\n", " ") end template = 'invite_mailer' diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 284cd00ef4d..b863955fe7d 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -341,7 +341,7 @@ class UserNotifications < ActionMailer::Base else invite_template = "user_notifications.invited_to_topic_body" end - topic_excerpt = post.excerpt.gsub("\n", " ") if post.is_first_post? && post.excerpt + topic_excerpt = post.excerpt.tr("\n", " ") if post.is_first_post? && post.excerpt message = I18n.t(invite_template, username: username, topic_title: title, topic_excerpt: topic_excerpt, site_title: SiteSetting.title, site_description: SiteSetting.site_description) html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render( template: 'email/invite', diff --git a/app/models/badge.rb b/app/models/badge.rb index f9a175713ed..55e1d81f3f1 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -203,7 +203,7 @@ SQL end def i18n_name - self.name.downcase.gsub(' ', '_') + self.name.downcase.tr(' ', '_') end end diff --git a/app/models/topic_status_update.rb b/app/models/topic_status_update.rb index cb8557f2a3c..bfd438bbae9 100644 --- a/app/models/topic_status_update.rb +++ b/app/models/topic_status_update.rb @@ -102,7 +102,7 @@ TopicStatusUpdate = Struct.new(:topic, :user) do end def locale_key - "topic_statuses.#{action_code.gsub('.', '_')}" + "topic_statuses.#{action_code.tr('.', '_')}" end def reopening_topic? diff --git a/lib/email/sender.rb b/lib/email/sender.rb index 29683770fba..e40cf09a675 100644 --- a/lib/email/sender.rb +++ b/lib/email/sender.rb @@ -94,12 +94,12 @@ module Email # http://www.ietf.org/rfc/rfc2919.txt if topic && topic.category && !topic.category.uncategorized? - list_id = "<#{topic.category.name.downcase.gsub(' ', '-')}.#{host}>" + list_id = "<#{topic.category.name.downcase.tr(' ', '-')}.#{host}>" # subcategory case if !topic.category.parent_category_id.nil? parent_category_name = Category.find_by(id: topic.category.parent_category_id).name - list_id = "<#{topic.category.name.downcase.gsub(' ', '-')}.#{parent_category_name.downcase.gsub(' ', '-')}.#{host}>" + list_id = "<#{topic.category.name.downcase.tr(' ', '-')}.#{parent_category_name.downcase.tr(' ', '-')}.#{host}>" end else list_id = "<#{host}>" diff --git a/lib/ip_addr.rb b/lib/ip_addr.rb index c80501c3bb0..22886a5ec38 100644 --- a/lib/ip_addr.rb +++ b/lib/ip_addr.rb @@ -16,7 +16,7 @@ class IPAddr (4 - parts.size).times { parts << '*' } # support strings like 192.* v = parts.join('.') - "#{v.gsub('*', '0')}/#{32 - (v.count('*') * 8)}" + "#{v.tr('*', '0')}/#{32 - (v.count('*') * 8)}" end def to_cidr_s diff --git a/lib/slug.rb b/lib/slug.rb index e2c876de701..133a4e1bd1b 100644 --- a/lib/slug.rb +++ b/lib/slug.rb @@ -20,9 +20,9 @@ module Slug private def self.ascii_generator(string) - string.gsub("'", "") + string.tr("'", "") .parameterize - .gsub("_", "-") + .tr("_", "-") end def self.encoded_generator(string) From 176d9e4863b330a8b817c84a8879aed265c0f54c Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 10 Jun 2016 22:50:49 -0700 Subject: [PATCH 280/320] UX: use link icon for linked posts ;) FINAL DECISION --- app/assets/javascripts/discourse/widgets/post-links.js.es6 | 2 +- config/locales/client.en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/post-links.js.es6 b/app/assets/javascripts/discourse/widgets/post-links.js.es6 index f7b621a5072..db9fb431247 100644 --- a/app/assets/javascripts/discourse/widgets/post-links.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-links.js.es6 @@ -22,7 +22,7 @@ export default createWidget('post-links', { h('a.track-link', { className: 'inbound', attributes: { href: link.url } - }, [iconNode('arrows-h'), linkBody]) + }, [iconNode('link'), linkBody]) ); }, diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 7c4c6c749e0..8ebd0082043 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1083,7 +1083,7 @@ en: invited_to_topic: "

{{username}} {{description}}

" invitee_accepted: "

{{username}} accepted your invitation

" moved_post: "

{{username}} moved {{description}}

" - linked: "

{{username}} {{description}}

" + linked: "

{{username}} {{description}}

" granted_badge: "

Earned '{{description}}'

" group_message_summary: From 73859e8315597e95c1cf4adf4e7a3580c9efbc10 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 10 Jun 2016 23:54:52 -0700 Subject: [PATCH 281/320] revise new user welcome for 1.6 --- config/locales/server.en.yml | 52 +++++++++--------- .../welcome/like-link-flag-bookmark-2x.png | Bin 1479 -> 1532 bytes .../welcome/topic-notification-control-2x.png | Bin 48063 -> 62746 bytes 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 2ab37f4dc2c..a0a5c6bd4cd 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1746,34 +1746,24 @@ en: - For search, your user page, or the ☰ menu, use the **icon buttons at upper right**. - - Selecting a topic title will always take you to the **next unread reply** in the topic. To enter at the top or bottom, select the reply count or last reply date instead. + - Selecting a topic title will always take you to your **next unread reply** in the topic. To enter at the top or bottom instead, select the reply count or last reply date. - - While reading a topic, select the progress bar at the bottom right for full navigation controls. Quickly jump back to the top by selecting the topic title. Press ? for a list of super-speedy keyboard shortcuts. + - While reading a topic, use the timeline on the right to jump to the top, bottom, or your last read position. On smaller screens, select the progress bar at bottom right to expand it: + You can also press ? on your keyboard for a list of super-speedy keyboard shortcuts. + ## Replying - - To reply to the **topic in general**, use at the very bottom of the topic. - - - To reply to a **specific person**, use on their post. - - - To reply with **a new topic**, use to the right of the post. Both old and new topics will be automatically linked together. - - Your reply can be formatted using simple HTML, BBCode, or [Markdown](http://commonmark.org/help/): - - This is **bold**. - This is bold. - This is [b]bold[/b]. - - Want to learn Markdown? [Take our fun 10 minute interactive tutorial!](http://commonmark.org/help/tutorial/) - - To insert a quote, select the text you wish to quote, then press any Reply button. Repeat for multiple quotes. + To insert a quote, select the text you wish to quote, then press any Reply button to open the editor. Repeat for multiple quotes. + You can always continue reading while you compose your reply, and we automatically save drafts as you write. + To notify someone about your reply, mention their name. Type `@` to begin selecting a username. @@ -1786,45 +1776,55 @@ en: + Your reply can be formatted using simple HTML, BBCode, or [Markdown](http://commonmark.org/help/): + + This is **bold**. + This is bold. + This is [b]bold[/b]. + + For more formatting tips, [try our fun 10 minute interactive tutorial!](http://commonmark.org/help/tutorial/) + ## Actions There are action buttons at the bottom of each post: - To let someone know that you enjoyed and appreciated their post, use the **like** button. Share the love! + - To let someone know that you enjoyed and appreciated their post, use the **like** button. Share the love! - If you see a problem with someone's post, privately let them, or [our staff](%{base_url}/about), know about it with the **flag** button. You can also **share** a link to a post, or **bookmark** it for later reference on your user page. + - Grab a copy-pasteable link to any reply or topic via the **link** button. + + - Use the … show more button to reveal more actions. **Flag** to privately let the author, or [our staff](%{base_url}/about), know about a problem. **Bookmark** to find this post later on your profile page. ## Notifications - When someone replies to you, quotes your post, or mentions your `@username`, a number will immediately appear at the top right of the page. Use it to access your **notifications**. + When someone replies to you, quotes your post, mentions your `@username`, or even links to your post, a number will immediately appear at the top right of the page. Select it to access your **notifications**. Don't worry about missing a reply – you'll be emailed any notifications that arrive when you are away. - ## Your Preferences + ## Preferences - All topics less than **two days old** are considered new. - - Any topic you've **actively participated in** (by creating, replying, or reading for an extended period) will be automatically tracked. + - Any topic you've **actively participated in** (by creating it, replying to it, or reading it for an extended period) will be automatically tracked on your behalf. - You will see the blue new and unread number indicators next to these topics: + You will see the new and unread number indicators next to these topics: - You can change your notifications for any topic via the notification control at the bottom of the topic. + You can change your notifications for any topic via the notification control at the bottom, and right hand side, of each topic. - You can also set notification state per category, if you want to watch every new topic in a specific category. + You can also set notification state per category, if you want to watch or mute every new topic in a specific category. To change any of these settings, see [your user preferences](%{base_url}/my/preferences). ## Community Trust - As you participate here, over time you'll gain the trust of the community, become a full citizen, and new user limitations will be lifted. At a high enough [trust level](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), you'll gain new abilities to help us manage our community together. + It's great to meet you! As you participate here, over time we'll get to know you, and your temporary new user limitations will be lifted. Keep participating, and over time you'll gain new [trust levels](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) that include special abilities to help us manage our community together. welcome_user: subject_template: "Welcome to %{site_name}!" diff --git a/public/images/welcome/like-link-flag-bookmark-2x.png b/public/images/welcome/like-link-flag-bookmark-2x.png index bf8b7650d3816fe9b45b36b25f96a919cbcd9732..9961fcd30e8096e49c80f9e399c349384ea6f342 100644 GIT binary patch delta 1525 zcmZXUX*kq*0LTB6Z95$4P&_E3xXg!?~)=2!hyrS z{vH~Q2B_3PrUWx8FsBC6DKM=B$ytA{jqoadPrvsr3Yo#Giis9Hy_+~nMBb^A} z$w5n+!KesGrhr%h*a9@W2ELsQ-^xOsmtnnZFd+v3@cDeTT8*)INJ<5K^*MZnjNHvd z8#}}{{H@jg$2Om!8cODH=$fEN2@6w`s1VN-yDVk4(!=Gc+FL2}^ z91e%UV6a%M+1Xj8Qi;UBLXyjYkT^L!Jd8DUz)`7K&k&MSiWX2OCnv$M0C|uPUnMh{ zOg5W6Iy#DVvyixKkw_#Ki!nL}NhrqpImrDyFg%7aMv(_E0bh(fDgay&kH-T)ej>d> z(yG8W5t2wj5=+qBTI6{-`l z{yv@m4SjNM89qJ4P$%B3|HQW-($f&@{KacdIb9+TU3xU3D`aoTM;FX2FyVKpmP(J~77(HjqmX~ET}R+Hjgo1#r+UM@8N|lbyBE zEN#P5A6;!Dd|5fc!oE>YC-Izcw&X;`Sxc?NMT*4%$ftQix4SD;x7fxyKvifwTDh{S z>IxL7FlG&Q8MCY$d+HxP_F6HI542{U9U(fuM~-mc1Xq~OltPpp&9ykfX4IZS_Ve@W zP1iqP?@x_z57N$kF>=Q(TgQeIs_W{KQL`$|oRH~jyw&S>$JOptmPa<6*ZLeAd)W$< zQf4dhTekS^y?My0FWo^7Q`jkoEuzoGR2t~U$pfaidBHITN7f$Sai%Tlu2qplgb{t$ zHN3KaZIt3*VsbRx(q(4*2lM?pmFqdBHYBp|y3eikfBo|GV@|{k-!JzT<%RoJK4J)k zm)P`e_v!@g7XnC+8#97Vs3Uk3yrtB3FCooSciSp`IL6&00@t!DW*JMG)SCxWSRf zXfO@a@ZAK0=sgqNSDVhCT$50^{{9nBGR^ZNaE^L+;NHR}yu)m`gsXlST^qKf<;y+rZaT1`fA(61>iOdCf=k37CbC4Y9f4 zO*GD?%_I-Q`RjqgA*E!u-R@=K>Yg>H-rApGg;ZwEIT1DWmo1h;ZF``0ZsLmes1^c2 z>11ZA+*z{=S*Z6&x{kjkHnb1vNHN_<(lPq4ETk33T>NZz$ZV}w>aWsePa~<{ZM#I* Qegq!!_BcqWc0cp*Z}9SlWB>pF delta 1472 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 du6LEMsm3 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 b@R)Ara`$d7jgT&QDMa&@u3F{I$It!?9f6gT literal 48063 zcmce-byOV9wmv+AyAy&>0t64igHJ*dAXspBcXt~kxC{{765QQ22_D=Xg1fu_n)lp$ z&Ruui@8540s~M>3u3cN6+Ex4MkS{V~*cfCOAP@*!Li~d~2!!+#1VXSuLje9mP{|Mc z(G)20;hmx@cyHb)d9@26aAffj1C?yS*f<8YRb18(tzFu_#G&6_>E7of?h%BoGJ+1s(~3fI*=D(Y&Stv?p&m@_R8(Xn3C5p0w-1AE?;mX6uJtj#=BUK!DRM8)JXZZv?PYeEwSNz^>sHOI z36ZMut|>vaa}CB9RM%G;tJO>5FL6L1*tKUmsM)k9%pdLqojgx`r{rins9({uW@g5b z6n;nv2vRk}LgzLIG;eep3FVS=z8FbN${I0!^ZZP*MZ3(S4d^0%nFChvLvLSOUbbZj zU7>*Uo+l0iQcweJ!-toT7MSX9jH_mhs|s-6d$Zo-!O{O18tvHCs2dG`=gJtGdNcq! z_QKDXy8VLMSlAP3Q)Tkhoa^SakPW@A*zJ<+R*&oX4U^249=d^!F?7%FWLXn2qzQ7d zcdJy3`XEE#q+%(}SL~dnW7}vw#=xBO5$w6hls0n?E^jj#2El4+ZOQdg`p!)YmzOT! z8AD*=u;M}e7VI9+zC%lCO`M?iaf6}>0=P5^V51)IHXk?AH7n>wTevGLdQTuCV6!zt z4zo_06Elsoj=uNQSY1-4Hn3-cm*R2t%s4?Pm6!Gt$%3Gcu6>yGa#!&AI75 z3D)nECbM~be7uQB0L%cKw4?;Bo!duR8yg#2!vBwBtZfcuJX-z_pFr;%Fs@Q%`II$s zd+UL4a(r9?2BSYo|9|*Sj{qRf|Jm|yr^AL*S=Ojii+J~Yv<_{aav5M$Fkt-e2R`z( zXdeoAxPZyKX|gsp?>Sh+rG#9rFq9O=|MX;H@8xw z`+Cma7r zN&$XpM=>8KV6LFMHarL}57lk?jqXiyS{++qwr^4_sfIFz{ulH5*^3L zl(%-77D>D|>8mf)JB9hwr_>=b%eJl$ch@93p2x#KMA4sY0E*#-Qt=abXE{d2R$NGm zh9)<8nSAJ7+Ej@Rw&-pUm7! zjM$8Y$Z@}Z67$3TM~+zr1jFOfA%#Uv5(UTV!syU6F$D67os9c$_44xa6k!GIvy9am zb=JpRP=Y7y0O3L6?u<*y6mS&D!f%}|Ci8xD8T_hwH`_aWV9BMhJ*^d~UX+6kM|yGu z5K<2x`A#cev+9fTuXRNm*2;lcjo2qOQ`%z^b}1CXo>vdIhrHW%JL3gRoU>MNb#03z zR?|_+snsyH)?uU)T%oh!oCIz2_=cOEA_WBnObm?Q%jJ}mR_5i3DLF3jlqE&1iB>z2 zGv9q+;|S~P>ruitTMe7(MPgh^Ly~MQidtHfAs_U&eYtMUc=CyvnV71hw+2(~x=8Dm zygjU~tsM@jTV{;=6MyhqeI{HOF|2YQZYpZbYHO502Be2Tjg|K|6WpVrztk2xI0&q0LgOl9JMAfeT#~*0P$t?wrcXN|T{j&TC`ZIF~cV+e#iU<(DiXQ_2uEx64ke&@r1NAD-Odw@JTzah?J~s9WTS5 z#fvZ6MpL_`O@kF@+hbyz5ul`IKprTp7>oO19lNcyTl-L{kt(Jw>mevh(kpj@RH0sA zm`7ZR%xPJyt~Z8GGIcc&oBUY`*Q~#mle&Q8mM$-pNwx6VW@>+b5~l$!++EB4@?ih! zv!rBLtFtqVi*F{^&rm`_Vh=pJ_}yx)Cwj!bluu4Y+bzd{UF72}6ejiQAB9k1iyf$I zmW)q@g5~RU!kL-p7Vu2Tv+c8l-YB(y$%-C5aH^)RKF#w}(9_ea?~P~Gkm?)_XjgTI z)JTRJZp;j(2{50S`IFHJSj}=Npp2&xGb>MnId;-L4&<~HEzB$=6J9GBpKi1OTH8>w z61)9wW$sh05~*sZp7*hLvMFAs;No3qSlEC%Qjg(N03fUt4&nH?7)peLN2z}AI5fFP zNYnQ4h!c}@Co1%IW2v@mBwIMHG*|qYLos`wW(MPOlU0+`Xx*=!d-hs$%iWZnnI%mS zIypX`h@pLZu|HL!u{rRQtl3>ZvIZgBujtdyS z)JbrT1zrb%tJr>P8gc%JzO~RE_f(s)&e)A;Hsdhj}q-uk6As zEfpfC12?fybB5d%E}zI{$L^KjR^6h6GVdo;v^EEVLHk2OQ5!p z1u!3s77hNWs!HsE6HWsyY%X|dVrvDD61q@zaQbM|E0xo36@{~L+C&Q9#wSw z7kYwEj-rops+bY5;Y(C<&BYh+xx(=hlOQ3FZ@IIWEu9ja&nGk=+sCOmIXEber8)|K z6(viHIV=~e*A&u;st#z=8Nv+FnE#0>E@z*IL(WBYY7bbr!CsMdXtHnhJ9VzxFlJ@= zX(eXdqJ(Cgh+RI6mjK$-S2Y^_M!_<;xyr3X*m$rz<@s_9Ovif56iyz=egjQP?RYYGm@J- zi#T)GncBvBf=;A1jGYLh0Or<3YQjYlUrl*vMDDUT{ewh8V=RNic~A9L{Vr2r5tM75 zPGzY8mbb~PuIBRCG#W_ep3-tjqxlD~Au|YTgY9CEsrU*oOA&)H-+F{>(%)o`@w_rXV5T%X#zu;$UI!c%s3<1bMJ_5|PpUF$tqk+DHO{ z7SI9Q5iI}lW855Sy>TKW;Hj@Yglq|xh6_D z0t10WG`m)tXe4ho_fuPbymlYM;@^K|6KvF(5yh&}l=mwRG6#{S{~@gs$VJSV!6)aW z&&kO-@Dak+awZ?gKR?Y7NJydAEmg8d+||aV8Qb?b7!k$$gfZ*iYcxd??N zB@r@Tvh}k*RhWM-o*;VKRzT1ZvRM}0|E9Eu`J=%@b20K?6NFxp(LMl}%hy%*`* z4kbQG$Y%rPa}))}N{`Ef&2*1a(yBrUwK!H@>-pz6L0V5YNj!%b4F>XK8%790FEnb} z>4miUn_fDq%d|ep2SO58!W^60yZd~abYx=C=Pgnp=zhDj5&J@Bs>0M7PFc4#Ou7ukC?F+9`Vz;4~WKpr-2iw?BO=$2g z-!6ko){^U;VFmFhnXcK(BAieEm_DqL6OmvPl*o1 z3^BXmbN1^K_Cj5ivP-7Nn~laTTK;6i^W!LC4;#tg0_CS}Fc6R=KMD7wNMN|9E388d z_Ov(w$-pH|C`Gr~QtN%A)9(Dnwi;^|U3Vm9QPsw)V7Jo^vy2SS zlit8UlzSzgomQ%m)zayx>Ag-Fl82yLuiJ~K6ms5SXhPxX%bz%AM1DlkARKJ{s@uy$ zYHssy7neEiEiG2Vi|MY04}8Q0%0WMSpY3jT; zT~S{CW;DCCRoE9H`+?YEbFRjs&T(7b$auf)!Es~*A0qnWOB9vR*};TIJu8y9hmU$B z2>sr8Bq3D!5yf)xaeI4v%7Z{ee4-{ruBRBI4xu>~VPzCz-1=J5j z$`DI1K~R8LmqKd;K;9RIH4HF^8AA58>*ryRneZ7Hm}(3tNf0bQ=ko4fcW`maC^awW zH&RnJtINxu=uC~S@fQ>n7#GF>Yj5@U?+^-{?kl!0ZEE+Y;o1qUUbnMCmb+7BDhBEI z8rMh5?UzeFZP$&29eBzuvNwRAq-lLhyWzKSPI{f(;^5#w+&uJlHQdxm<(}$-^yqQD z&^N0{xg^y31KWo>>xB(qmq>jv_`W-yLZba}Ot!qgzrT4v2)K^554STk1K$M4`on*( zrxEYde?4Q2^Qm#l^t6}saAesov{qK;r@*;s*Sr1D+q@bn@O@{~`(X1*RC_~qYk{{@ z@c_&2lQIQEWC`T$LA9YO&)-9Mjy((V^8u^n2&sE2*8SsAJztCwUr!hRSmi`RAlp)?1!fye-WB znB&pwvS}%;S_=ph3i9|>N(~;d4{cc4#%*W#ALCE(N6{uUoI65qrXkts=G2MqeAgyE z7bY(vu-(5U;rd*)|G}a*sZ6X4N?w1wDSLdcp14BLX(Dnv)0+C#1abMpZl9wRf&nc> zNkD{A{p;2%{rHm9tX8UXY0ZpsJIOx6_oL-Gh<2ktzAe_w$5&ZO?%IXw(ufEI->NwK z7mR;pcj^v!|x;yd^4T9V3 zCXXYa&1BgEECk-0F5dKEDny869@05q4t^g%jjnIv(x=JHFoiCOpnRuxo@G< zCp!NL*v)(+QH<5FZdk{C_=|gz!a%}fO5AaGCi{4Hy_s<+@B#e@<1BG9HPHHmIe?)kfinK zYhnTx($dXjUA&8CExqt@h!F+{PmH+1w`}U-$mcF#+LzL81w=Rv>{AI$WMZ37WChzy{4=^4x&z4S65dWFGd;=&nQ|}hB1vUEMd#`_N$oUZ$Ud^yaXZ`z zdy2Y5uPBWMi^hT9mP?>;$S`}s)>91R_A?>?gG?hBe-a{b=Q;9`L=VB9G~ib7^HvLP-=i;~$EBJ6bLFcE*?>iQ7({yN}|2C}bi(*(H5cJU(9&2i1Si zV8AuKGn4gDcQch~T|kD$A82`BuUB3ov$=wCd+qFBnWy^(*nqT#NrYBZ{xH6mh|mh$ z^9+vk44cZd@Jm6Z_ADR8qrUr#S^*Qh+Y%E=?ruC`dx1mB7`&$N(eT9Qi_rjy_gNP8 zFHhn3@&nl{Y}KDtHDZmNuT^}`RoGvKY^8o%*R`Y7xt*N~RlNHn@^~u3R`l!KflTcK z8iF{~e4x)fkN+*VfgLMZ>+QnfGwcBFPEk)i6-_1nxUf%|X^tLF*{jhYuR92je3(ts zKF`g%e~+64L|!qt<+=Q}4>pl(yr5(G_~&nqaTMlZqYwsq36mU^B%;-*XRu--Hl*)3 zbT8sk{I7r9Mi3|`H!7omKW>CnCb$=Rp3Dj?9!F-PT0_wLi`AlD3w?e|{o+^u_z`|? z2yz5jlV>cwI%m&@Q7*ZYs+o157oOBn$wUs#s{}^l%$mkLVOI)tvB4L{j7Pb~jqY3~ zD`Wu?h?EG@+Qt)^`4bWa+}IkkAUJm21cTl_5_tr{WI1{8%L~$1N0gQjgkp1wz-UMF z&yD5iMx>z+imG|Wqvx10FIvB4LUl-XD-anI?u@yEy%v zlsCCGeQEhug_oxf$-7$8dOZj5{Mcv) z`Dz@T6P;>*U)mbD1?*b#enw;t|C-jhY@AYyGuN^x!5s^mQCi56-2ksmU+|w-mhRqE z)mYYiiVN1-$j&k=81l>(a(;^HD{OG5Z&L9~{LKCwxjqncOQ#@g+?%wXGg|TfM+=+R zwxm}nLcX^KNZcxE;5m^&9oBJ;QG?px$$iCuya+1As6GHh94wO@z;UVvf zs*>fqp~t(SKJAN2o$ELq^ku9`?z4Qol@0W{99tn`aGumO_L24UC<@F{9I%12e}pg$ z%lWG|bwG46J~}an0;8T8t%;`3HY1w@)Ss?qHNJU5SQk%qU<3Udw0x*fKTN(B1pjjl z`!6IVkIc;zK8?OeOs4^m%GjP);YY2!f%e}e!eu%qvV&(SsBn~nWE)nti+Ot*%RM2~ohIPm#r8gj|9(XqeAGvzr z(?^Bw{CV8|117ZgRo@WC6szng`>hJ!w4jk*KWUWqm#A;HQ>a}lWc6IXTVJ8}yJaB{ zaQ9~=p)>$#)V9DyMbod(MF>G{q65YgkStvrNm4|w6PQRpgJsfc>JGB1U+g4a#7bHYE0%{^dWUpV5z z9u|ag%_wh_jgH2xFxjXKF-zxvTttJ8Zo4+y+svaJlytIt5A%n&Rmpm z8HLG&QGH~@ad+E5|cgiYkoyX*<=3Mil%6GOZQR=U()5|R-Mw?mpZ6Qyp z+I&(~IIjT&RgX4yt``;h{^ITG4R?8Q>ucQWQ{7SZjOm;YXd*>D#Cj0w3>8lXj9CQe ztKG_kz}=|H@(FCQG3AW=53{v^_nkT;!HpCD2(eX3D{+4LAw^fDS+K+g6GZ5tff2E* zcbeBK2{!0}7>BM~J&eB{af0D-pGq7p?=`KPC}im%7Hx3Xy*+R?27wTh*1_Cyz1HR# z2t*t4*WW52HKAPa)i*g0zu%+?;vzMCu<$DR8MP0&u*8Qjox7Lx-)z^~b3yij<-kJ$ z)Or5NKHN_;WB~!%$h$+BafKv^FEKf(FEdGsOC4l^GW?aT&$O?+$~w36;Smc$Uh7T+ zYA6$*1LPM2&Ezxn7W*)n=O$Ehul5OsW{=9#O?*)N=zAbHUmf7|#oQD*VZ-%ebS{Ko zlFZw!vISB6Z3f3M)3Zt{oD~58;5rNHbiFKFtff%s~$ObN_n9*Jq}N^0{Fzcs2Zip$bx(@e_jw6qOga)QKYD-HH z1jyA!c|~%aepsy}g@qpp;n+JW z{aITH1aaVuNc^r9_<*Vq!vSY?iwRE?{16nBC-5OpKuuZj8C~C+=|R!jR|(K|p+VYC zmt|L1Gb3nb6-t3PWpI+>UJ%#9he?RLN(y6!61jNp_Myt1Bg*PC&d(soVGv_KDD z>)@u+PiF*$RKB5PMEp3B@pzqaI>%hrJeqdaOBf>9ZXwthOJ^EHUQOp=W#c}U5~Enw z`{MMbJV*%Z9kvK>=ts0~(T~%Kyr_^{iZ||m&v*uZR^ttZzfIBjf;twvFx}&x=W`Y0 z^H#2qR9KP=f?A3J;_GQQtgr1k6{+f;H@Z*V6zt{`5(P1WQjp+-B(a?#JN`80E}1}n zhl>rU7?x)jflAoOUzmpqS(QgJ+-^DaIxM(^);{eT7Ayq+rf*dnN!Ex^Y?Zt!40Hf- zJagXgkH7}4fuBo=t@ZsVA9Ou?yL{8BXqWDj`ZJaF*-?YRGd&0V32yemXYsWqAVWr{dX}|@|iiXl(?wbR_j06{$-w$)&T+g0m%xR+_|5R(;xXGj4|LXuWdS0!> z(^FlP-24I--uI`a%ttLfJwazmlr8R+`1-m8C`skUzRyZagjLV&P=W6a&ei)zdT=(1 zI4Q%gzX%r2zGZvgr`lbq>r|)?3CP{9Yg`Pw*QXjUp1~}ol+_)Q;~hQIT<(cA{Z!n? zv_RSHXKtHm-EB#;si<&PoO*^or%K=$6+u*xMaQS4hcAV@pEhD%9_9^T{@N|IvZdq;(vFtxr; zIi^a_Hl>ZMQGkO%pVaiUIV%cl`0;L^Jhe9CPgCMB9Un{R#$ zt=L%5J=N*{ZeqvV?fj*04lBt`sCT1ANt~Nd?<7cm(rh=>$y8zPzYUT<T{dkpC%<5hH*hi^GOEX5_|*zW~V;EY*C)j1#Mo)ubQKwhYJ>v~*NW$e2W z*E4D4t>-tq^I)SZCPR}SH^Nko*oh`?Ue>ZvBO^*vz0mYL`%>`)X=BF|6Zo{JdnMr*a4+K49~;p;y9tBFE(W z;Q7GQiAjSH3RvLr?$nD_c0}CiIcA>E90Hsx0F_Uo6A2OTIbT;G6}L3t?zIc7xPnCa zb(RIwy~?hz0EAd4e$X~kyg~L@udV?N$PM&q6#tiP`LCa7hEb=b88dDxgc&`jmV%pg z0tbu(&&wQ#VYUh&33q&nK0>?J^AekLt;hTbD<{ly?s1d0=-PcWNEFE4Q=KT@@8h+- zNATN?5PCt8k&5Wh)d8mE@4tUJymJP_jSokoHfm~9(tm$GL2nP5C~b0Q7#KQEHf~=( zGIrDajKCDq+ARd%;c3`;It!EfRnN9~*CQs3Kx8L-fdwnZm8UkEa>_YrT0Ac$l->F? z@^*xrcVl_{jYBsLhV<#}*R3K%2>mNbIn9ZbbzOlmZCiE?a7@&B(Aldl;Od zy|vle;}s9bpAIv-mvm)Hpbv~?>u$ZG90#uMfzVad2h2<7?U9d&7TiNfP_j429HO?@ z`al-lJjbkkj8Qln6Px$FyB>*1jv#$WD*cr5TU|Kr;|V7}2hJ^#%w1&U5zkDf2eTVQitD#Co^iUD9M+G3!?3wOmK!xmaZ_6hyJyh!6|>%2qS0#Si5b zFJOWon(g4=XuLpu0l|(}x};q~gH7HW!Ed&KGnd0`%;V!JattyyNBJ5~Q!VyKXEt^)XJcpQt#Ga&EAD2dl7u}|2pkgg49~%j$8+&5{_7nb+C+dX6HH&viH@I$6}B7D zYsg{S-+VjKQs^_lEzQ<1Eh`i_l-F3>W8qPDEA8TQ`AEwHk`zKzjHCnDRzhF4x2cOn zq4DVt(KK%$1`aUKa5{lmfHnh0$0HBveC1Oip|K~M5ve#+gJfuFMVxVcZ02*h;L=?y zwC!3#VFxC)S?`Ia85^Mlfzc5N-jew^=OOAo_b&bf&Ar{YJ?cn$&Jo!U3ty-xZN1rX zWFdq?e~%EuL3ZK3&k4h_xI5UN-?Nm;L%R+l*)8L!^C5$q@sahS#|Q*?@c&H&%YG_Y z{GSvtTA*@)@DG)U@u`~eKgeVMY55ON2;<)bpnu)-pBA7#@?V4gf42Zb{foBt|EoCm z{fX?{L1rDn_^hm~YI=fKfBkb#CkvVYX^7Y%m(>T4LvB0GrkPlX?ZN;8`|?7q4w&9)s9@5VLVge9`JJss*YoraPeE$EX{{xV?oxLnpm zc)Oh*N^8cyuQ*vx0D1;^=tPAR!OihNptqq2_S=&#OD?NB7!9g=TpX1SHkZ~DjTTd- z5BIluv>N5Q@06{cl!phG^LClq55);5+dIn{YPaF3Jvi(I|6?Dp+aYt4x7YlrOrAmG zU7uH(nCP=t5XmamhZeilE}#T+iAa3~z1y5>y{PdxY~j^jx{C*D^=$wlLPqF(T-I}i z@OppM_?So`S1M$x`L|_9iwxiTw|YD8gew=RknN!7@csS$CuREVwk;KbXm5 zC4~O7esM|3KER<7nQqa)0k}fXT?(GVjdqUdMXq~+NhN$0#p$^|-4v^tq<~Oe5YK*C5@-;}%!&PfqhvjsVxl43F)h!t?s1lDl5NGc#1$-~zlQa#90e$a@f9#VVBN_G{t=5^8MobrVtw+(b>9m&Q zn1bDYqtlO1O}X6M#WF%xBY@%*=jfS9y4$N=$fs-XBY)}+TYW5D>&0fiu1lQMSR3!t zlxwi1y+11MBEUg-#!n2dTXeVhD)33Wi)DR`UMdlutK%@hUEtA&d{a>2<|UhT*q`NnHg(r`vT_kygG6v zt+HQHifjRkMNv_TMHevABOA_wD~k{~);04GD(@=0zh#ia@soni!hymuOz^(0@W*mU@Na&{8}M`U{Ph4|ecl~#iG^aT>Q*}Obd83k~zle8AA?uAoz zCBzfnZZWVIQ#;wU_o*MRy5o5DN`OyM(e4N6C-ze9mYb74 zHdzII)K1r`B78WH-oD@yxXdlyAL7m{k|e22^tG4mzxIZ9QPPl&NeF+IxkyB){Qb^x zMVF7xWC!5)oB)Kz!{*aLSAj8)ZyU5ene|MsK8bdbzLFdySBroZd*Y=za?QRy41QW( zz}G&Oma~^GkF|xfU_PVc+7(p8uW7Ufwj5To>dRbIb~`OK`=4bnJyjtW2?!+6k ziwi_fX71+*l_zF`=|JqhJruuA0+u19Y*@G!c(srV<+;gnl*4gdO-%_vQ|y7iFuL@` zI=*oc3|l2u(ZpX!oHDo*kd7MZd_Gz%NMEsQU^$q~^F58*LU{tA($Ql92#L-_6BbJr z`_vazDrMT-eBh)fL(Ja|w)!-C$4RS7qF^zHDG1co*5*fh;wAc9<1>U&cpHFrBs{kPoy*Zdh zUgf2G05DQ7F6L}V0Pq@KNbOpc%_~-|Y03EuPU1W2?MkLd|u|(d}CLh zbcR-uw&`1CH)mCsX8(s#F5Hc`OH(?DgO2K`e1o<&J7SZSk6WA=p|by^3%16$nOX(l z$#i_pDrXlsAd`plDOkF2LY1(4o-c>n4eka126#{^jYITL$dO=UalP8xS409Q5ou!2 z($!C_kj)TguYQi0Uh%pUZZP?-*LD}68$J<7(0aVA_LtHdYCoSpHzV^+mU{!RZEI?3 z81cm-DW0}jj`n?T5v(i+)!pw@pGFN-vsijKx03|iGCCJOpA?zULr&Xu`73u2#CcUp z3!M*T)*dduWG2&^CEgAON^J7*W}5Td!_*10MF3O}Z8lJ&_FeC$&v&N;u9%)=Jvs0)QX#SKai13|wBL_QSXC6?v%xugmXpU{|Fr1 zh7{jw9BxIsw$?9Ac)9ki`rLVd25?gILgQnQ18@}8uQzTma9;G#;w|gpJPx$s!FyAh zG=^L&AL_c;iUfDA3g)!auH9E3vTC15DS(Gb8m6uptYntt3D+KE*l6C@aVmGw;Z(XG z_}uSR@RCuQ6F;dB5ct26Eukl7{Qu6lo@r`nX#u=vY3YHFBwE>-0xu>D>C;^^0s9@3 zwF1WkO=~fd`pA7a*g!@^^C>(y;oui4wczx(6@W~k^7wFXkWRv)3YQJ>>G0|5sAtL` z2qRR`AJGR_oqRr2?YPWGooVs7>b^WzU6LWnL~W zV56)PlJ}g$P#oa)I^zLp#S<;}!MU4-vVl4#PQ*5}@)@x%WthtyKyagaYpd(Y-Cbjn z<}^ue(<~RE0%;LDE>F8+S*W*L1z5slMMj#$8R8#(T#h1GAjpQE%`zFnEgL>wz;0Hn z%2*m#dlX1T_PfY!q(sIW{{VEd7$3g%(uR#>)gcZ5PFOBNU6#L+OgbL*a}GJqiG2Yh zR2q6m?!mCCj0gUR1W~*G^;NAdPE}nrh~#@^&1v-K+ltR;%$`4(_I<2%z=EZs-L0>$ zZPf6~AGJH`cP8>0Kz2pNCi`Yw2|!0_>FYL(+1XiuPw|xEV~T^-SdM$Sb$`O1Dk|+k zxKR`A`W#;87jMEy*djAXu5oM3J*~pYxS6P36{8U3q0e+YPsAiWfdXb4r-_WGX!oY} zoz0~e5-|iac6SyIlX{GT0{O&hlZXJ+!Qm9BWmEG8Q|}&kCLn{|49zVq1p#Kx>LKq# zD07*CL05Q4NP8f5*pkP!&9Un)CNbP>(7gj)j-CyN?0bK5+Z|Y=(L$97F>3c->sU@ z(5sqXnG)LJI$mkiS4k5Olah=^sPq$r01S)P;>OR2m4rSaz|`wbG1pxj#K9pjmS9&t zeUCm>Zh!?i+11tc&L5@o(tXR(K~7@5?@ z#pUu7_3DA}mFJi8w|h>#;|0ytX@r06Z4MSCoO3Mc;y$y+;TSe==ce$?SyqY5*#2S6 z^E?|7v(A2TD|9*E{>mg(amKEjlF!?pPCS{H7cSq_@v7x&B`k>2dHTuQRvnLjBI0f_ zkLP~wIy$-$#T6p5I>FHC<~_*~R*dUCBI7xHN-=>z>`=QlO_HL**IgxgO0MZcqw|79 z3dRu+TP~??y99uR7D#r;mE=|NkA@U~(~=g}*1q>%(M6F$5JE2;X<)=o-`>~~;bvd3 z#+NYtfh8*Fd9$6@-ToDCQfexbyxU-lYpZsEXU_D1Y<)zGIzp5K$O%L|qdR#w`8dRc zSUF+%FNz&60fUD)-b~kmewTJwv;cgpYe@dzPc5xW-nStGo}Y9Tr@5(&U%Ez5VXpY2 z2%im$-mmGE=MM?T{vJn?9J(=YIDY=MI=Ep>A3qlg@Zpk6hLg8a1Wq5aGPX`xe%L*^Om- zB*TvmQ6PL}C12Y1a03u~kTq(p@zQBLOFaYmcMAJ?+VX=M1fLeOwg;BL{f zwlxFz#aqfCi~I(MT{y33oG)D>{oxB*@Y-yR#Wh|YYwRG}9G9%U+^F|D*ihT^BtY5& zjY$&JAdW2H+e*lTr?IK9Egt*ZAwkQTw6CT4t6vlFdd90sbuoo66x7~VFUEepL}jL% z{k!5z1|u39Gh+dw3Fr~|Io<<^oBj9Sg5@(`%oTV4eC|nN@n$bw?cq}MZz!J?K;h#G zBz+0Rn5-~WFw6)CuMRvD`x36=D!0283o&%+z~J4TABk>uz*d6h>z%B>yj!Ce(G%xF zQ!;69w+0x5OMn;r`nV=&co$0QK&^!tf4Al`@&*?YtA#mr{F-_97o5mj?j-zs3dz3R zSNctIeWLP#4$AQR0DMpkf&O~7Xt7{7ggL96ftsB8yK0(LHPwJU8a%Ro4&;skwzF+7 z40*v#Ll`(7i=ojI7FBCov(D`O?AEOEgV5D{_vxU(p{XDPVMHF@@8ogCSoZI><&1(@ z?rSD50=OAO(_8SkHt60e2amf+Jx6@++wt6_*yXP_=MNmC*wq3#&}WVmL8)buhw*nG zNKi@5H1U|!h9XJFo6>x9n}dzv<=L4l&sZNL16wHM+2%p*)VyDP$oL!8!P@Nis;V6#hQEp{u|T82MI2ZN`JLNubB z?1#M`7Rok)U%;Qu7w*g`d~C3O0eZLSA%~g`aXcIw_)wlvZOMBAz4zWB3)^ZgU!#fo zzj*7qZS;DeNi^ub!D2M#c}ZgXit$LazrG80zIN%>z+lrR7%O~0*?C&QBWBPzG3yIL2nr^y)sgnNdz}C z)Cx`pb8PDC390)=zi(h0ihjX-B)^oCWP}+;NnTSBY&5|o)!J@TK=AO@Z_=^*N-apV z6D>Vtwl(P|WErEN2MgBkQi3gt+WXermizJMY)qDXDU$kozG5`*MbNg9vnwEO(EFtp+V|i+W`RnieZka0f~(_>qG9}J;+zDz(fgFYsro8`qBi8T+>@Y}Jj&PnvsjV)|C}=z`K^{>SZ$zS&l4=%mv*2*miO z>2=(wc=8V{m?Q4ujKF)W>Y`P|u<3k!5QjW^Xha(78pG}^XMNb?&3&dQF#cMs=0YOP z$KWrrF4}B!3B02Bhz=W!Z|U7Gr84(1Xm^ZaPBg#O=}3Uo@G=DTVyXQ85I|o~o=2Ua zFxYR$6gX-IC?1iUZl*d6`nKqobwxyAN?}89K!!Y5NmC<9R;n-Sw`7DSLA2$y=Vr4Q zRrHiWrq7J;SvdxeLEnjVG|%mIOgRlsq%LJpRNRGcDK%qGIOCGJF0c8th$?zwBnO7C}pm~gI6|5f8h#ecYP1_`( z7Q!;=Ld>_sA=J0FX}va{kYwu(U+?B5fu%|U3b#emnMH;~)Nv+){X5mAItJZ}?ezq? zG3xR0|8D98hlI7$2KU*R>Rw0Dk=F`&SW=W_`8ak~)F~TJF~N#=ckn@@Z7&J7B@Q;; zh$>_3QOY)E9WwtWe+D%-QT@}w>K8w5;5+&vl_$0v+!N5FQa`(yzmI-34usm{Pkx~Q zKaX5@x|992Ouu^q*d7U>*3*Bh6@{n!UYnXfXUc-(Y+!TibCkJ-lXtuS{ii z^vli57q9cmTVEqWPPGi;rz0nSAx?e7iTdT0G80t82pl;Nk$ z@BsA1A`sxjdzQ!Sxp^~d+%>Fw;WwnG0*==+O!5m$5 zc8xG{)B3R7daLRhty#L?&~|cJse%f)#WIxf->sd5TmY(YsPD1TGs& z`7!%5+--;IeV33Z3OTeQBW&J#0&J+{851z@uk{8xCE`608hS`MF$tM_Gqhd~f+&sQ zLg;=Tyl;RJgA7l`?$)YF3ZAbYiw2pSK_(mDR*{^mQ)7QnNmP!m)^g4LXf-wtR8jZT zwaGB6^=-C=FJx6~q_r*mvBy4isC@U!(zYm-??wb=3mLcM|5BE4><)Pq`F`7tu8d}q zcW`=5Yt!!viO!#u<}FivC}PnEFR9P%83(9vWa%0(I9th>9r2sqsd-F0ON=2?C4)dZ zKeE)1B$b_&zhhjP)5hLfbC(WUN-DS@I7-XB^|O9>f}lr}0d*dpuJV3wl8&&3%Cey_4*mjUHB?>>`A9+m=#CaP+6X^965-zSk{A%#rjHH?018#qNETv<;v$>-YEp(?s9^EVu`vDKpOWb+a+UFa6_aKM;$S>+uyYcD^*_1ugiydQ z&}f6HAgnk{Hm2MS_ni?sgk=3jjL$s6Z*D(+F0$ep56=S`wp!%iccI#Yl4jyZLOfslzmKxeQ|e1y3mTv90*h-)u6(0qU^7eOptT*xV&*0qqZiPk=yb;}^fZ6SUnK z+nRK11qyd}*g>NF=x!;|r2 zlt?jM@u$FmoW9K1-0=n_JuU0Imv|`P9zl{gaP|f6|L{3XyZfvZld0PzMgC=mpJ~7W zPl?VVnPg9+hlDNY#Fv;m7a2vHg$L47T2^#^)XA|CTzj7h@+4s7M<=|~( zN^3*)9~-u#Oo7R0w#5}K>DYY!vR{3nQTxi$7g{y(w8I=^&<$=SbZ8?+A)cW0(Ro#lizB6`f zu3UOQa;MQ93x-wj2)v&1TV?CFo!Y)1De%-Lbgj?Yh$-cFzG+mTuUnbZtUPLg{XhMg(Eg(jq0@9fH(1+u!@1?|kod{^$R# zi)-)As#!B@o|u{YxgQk-mb1sy5ekb@-_;HpbY_ZQ60MexBnOfO;sFoq)Mx>Z_SCvK z*zA`2D^MyK=O7Gq52KFsj#4~ncc=gcZbO`-5M=J?R+ zZ(NTA44y7GnYAU9kwYfQ--iioPfER(8dk=P`UQe1SIU4^z(iZo&DYCB(|n=sy`e@% zqMP@nP8gD$XuuWBA!QZCY>Lv=g{mS&775n~&+Z}-ZuwRHTyxb?1PkUH?0ASIYw;D? z^;PwcH$J#nqi}A;Sd8JD%-(Uj#M%u|w6$Fd4n|fdttMoIenQ}`Dj7f+*H&YO^oR%n z7+%nyMfbb95c=yxbLk;nu4S2TKf)wX&7QOVcFxf*v_sN-*XLkPR6#4UkB+~H9gH2A#NJiO=p(^y_`GWk)0HZ+75cESTQ?Q~4cnVmF}fRJKQH_X4< z&r-#NIXo^HB6H_A{Hvg+PepT(Api3G`&;<%UDA1WbnF@PH%jk@KGM_prY!ts(<)jP8HUt)!XQkR%aSFww5Z}_Ff&Du$No2!1ct|Q_S_6ITlGCjqW?xRyH#}WTCPB*8u3jjx7M?}a~CS{yS|KwJX*=J)u z91UEIf19iWx)?O5KKsBNN8rr;4-qtG-^7ZLyJxK~PIHa_@1G%a2ZgIe?xDzHL)$44-iIvrfT#FB*_&@U`qvUuPsjnmCvYa9!BA!4W z=SoIJAhA4tjG2$b^6%f^`(H=kXJF>TKjCM9EB?6%{P+0pm4A1@FNbgNTm1Xi-vj?# z2X?`4{2!wv_-)2s55PbcL@l7OC zhAoHYZ1Y!I`90x5$k4xsrk#! z=$f&>f2wXD59U`qlC~ZzT!B@gS80}uU@pcJR>J|!%jNpp{;(gCAw-!+U>%gXvT5LH zS-|CTxbodvSyjhR`?3m7C}0uc%>$t>|1@W=B>(!&>8OoH2Y9OKCQ6q4)4A4z7FNRT zl-;V%po)g+sL;Gjy>1r1Gehf$&^$0r#gh=5HqfT_W=Y9?)c%gZsO3Mt!~fytdvn~!6U2?T<~|mi zTn8#7UBerLNV0yT=oiuz`Bb*-$?KAWloc9z$GfQhfJNU;D~$S!Nln#QtDLC_Fyk-X zcu^CW%;W?n<7eAB)q;di0j2@w%DohDYE|Hw`CT_Nq#oEp4V8N6`+nZmtB2EGViyOk zhX;*w&aOKT_Zegs@?9)mG762*39KK~PpEK-`s6-q{P6~n5V-^ouETJw4-WvXjmF!3 zG|JZq1+GeyABo2rABCTJ<>8gUyYv%ipwHEMs!h683YksjaVV+D<&5ci49Qjpz&Qlo zAZhA3hLAZqgjmXw5#F*Ly(3hCjX!P6Snys71oQN5zZd=8xnrltV+3E?fSwf1a_;nb zK}K;r#9cg=|MyTeL1dQqVmeLY6U_6dlzgojNBp=R^j!kE`q%fjzpI3fD=p&1QckXu z5x_`%gL{xob2qouhg5ly!@-+i!vHDrrc`#+Iw$Y~hyMrd=~3nEUaId$^B}KW=lU_3 z`=8RP61N_nkJ^g)A6_X@Ik7{B{bL9yI(|w8v5vi<1*_RM9jg5^8PFHPo%@<>Io#q7 zLOQ!umz*aFjwT6zWj|NaOCi0-=9MJo_KOy7{-?$!?{DxhPju%pH`r<}fUO zeoImnmrn9eEKnEGot5@e_jl%3P95`@d?)(! zbK=)~6G^eS@)(r$j~{5jby~Qv=#K4 zf6mOsNk`Hv26hlUS+@0GbmH2)e#l5+6TjZlhg~xDa9me&RAca3<0Q2p?T4U_XE%}Lq)+twp@yTbisbkkjp4`J93FPMi( z66oi7H7J_O@@&R)hRxiKJCwr@{W99D%jw9#Z)=rbY!aPHxI}`KPX0Z|=&b_VE`T~mmZr<=Dr26YWMzj}AoYI| z#C{uM{o@gq`oNq^XBLvhwG}aJr{LVz!Ovdm&qIc7iH6s5j}GdjxTYW!N1MQ&+)SHQ z^Qb7^l}a{DoP63L#o1Pbek`;TZ|J4-k1_9#nvM{4k0WUL_SK+QMkHj2gXszMzH+Jh z3ovH0r^cvSw(_d{!pu~y($fDJX{1@M<~`0=I7}a(dG~JA2pV8oHp@k8~=3{m3jFDSi8P zxvDnYfzDIerNZ@++QP-s2q)u6g^aT&-FNUUrlq)In57{~th=xMUfZyoBl{0$_5acb zO6=Y-&up4WSwDY{r4AWdaG-;pk2>(O&0z~YkH0$mh}8dD=+9Q(sV(Kx^>^A{S+3$Z zMVOvXpqQ4C*xnpa$P+gjY}pZ7M|wQ&SSi~(!jKp@?%X(;@x~i#*$|??_FHza{l?Kb z=2_fOsSpk~DanQ5SA+TxJ=2_KJ5+2#EX$PdFKMOTo}y$03}t5FJ%##;Vuwc;npyG) z6TysL8N{}azrt|X(WzwGSD$;xLdh|E9#Ne zH1pN>f6_TV$Fbm;G5cIxJbDzT*7h&;*GT6Xt%pYFde^%7;?yrf<#vuKe5)rErJKV% z_L&J8wA_{7WFHvynYyeP3O00!6Aw#gI;hfc-Io^63aOBxBfA!7sSKK2saMWpdup`q zv#+U`-wPM-&I-uud=+cu0iNgtCF|OSGJoZ6D|B3!6KZn`K5!XFp(T>ob2d~D-y6+ zhvju6ExqIpN9-~euZJl~{R>5=$iug5MAO6OOntnyzi{6y-XEV*B&k#$7l#{A1>YP~ zVkOg*kr1!z^8auXxAQ{Z{&&Ak)aqd|@45AtUmO<)>&M)z1;J@yZr(S*;WDl|iAK;h znxxk4PfGfsHNUrHKsym#8|vFE;r8g^3r|v@Z03t`!zta+U6S;<@1X7nArERrwT8B@ zTmm9-w{P&NylW`ndn-_M#nzQj7@RK1wdIqyolT~U%qNX z8jr;8tFy%G+g+8x$&kGR@JMe&~x>ArA_ze>tkpvd0*&Q7?Y4xx!PHJ*sD@VOzx02h zZ^;h+I!u?qV|5hS<8&_7SUG zdSdUmAjwZ@%e)QCjh0Cb#q|dmD0EWDVMKB-odFF1HJQp9&ckraop|BewL@U$WA+nx zIg%l>{2T(q{F}qb7?xTd8|gMOHLlF!PP7THN(2Occ|L~f(`#FXpR%>l*W(j9FB*$E z!TXBb5Ox+8!%JF%*tOUmgkJ|q08vW&*rFkvUQ)TSDJ?_n>VPoxT%0hgNSo7x0E_g{wu?O@&SEiL?QT+C@2y>`Ae+Lk2$0jhTiwV3vPzQ^@=*L12SVhNB9^F?ySux+Jx3cG<{-n1i;G1>1WwxEjDrd_sflLPVaOvAOFg5l5LxAuFauXRB7njH& zKLN;6y=XMAC`R*4Oied^JKEb97GmErHn+7Im1wQl1Ydga(%SKoA6q>#jiGyYP-hP> z5&*;g`v(pjf{*=w`S?o?`hWQthl4i1{I4IsupYq~kN)-Xd9;dI_3)lW9#ka}@$VNm zEhGFt)O@gqp&ybA|009Jk24^jj55KG{copez|XXlRDgeB%OU@N|Ak-tzZUa9mioWk z0|$n8aq#tXtYygR<%CN68bo2S|0 zN-0$}BETc!elg{}fQoy4ea|s0;vsarmJ~N9Gm_>~Sr|WjEPD98z~72h$Bnv4{5#E6 z&R=dWS`65|@kaTA*ZPDD0j}I%oE`$AUG4s<=1j_71dV`8iN(pv)Lfip{(O+{)oN7& z4lHWQp0Xn#2f_e<@esMkw4?2JLEVczVbA7n#5NTp$E{?Bjb7jM65=4sFwlB#3;3;s zewL7-rNw~v34omSQ(BF+da8Bf|2j4J_Ijy3EKWxToQXxkUcRi>iJS<3;{ZcQ-F{JQ zHy20Uyv0Rcve$NbXOn}hLAtO!6n+?p`R_+9u`8a7w<r zg%H~R*<{G5UEkf~K8YizvhaRqb=IM=a4C3~%DM$lKVCvbzh&CD@@y$&wUA-KuX6Rk zZ9?*(@V4LJ>2&k$j_2;~Tvp&!h5Oq`fgHOFmu3a+vy!jU(Vhn)PnOR-H|c)3M+(p= z?SC)pbhp~nXqKrk>F(W=7b}`jyT$#dqH7~PNl(dIhdo~Zx-8j!7)RCgn)!4ryx!l% zi#bOfYs&ct!(7U)SU@@X_$EY)jY=?B1O^d3-z%d_vbNo*2ozC~AJJ=8ze?3iD_IXy z$=D8XjI$K=*~FDAuxLbXjy3$O*naJ&z4u&X(leO%9mRL3Y^A8$G^*j=U)tqg$VeK> zwlfyrN~dNH#hf(;sB0zzbhB=4Q`2YRt|DDOp`i^`-E72$w#HD!Lrb zQ+rD`+Neom>y836tNfLTm(f=ze8=J4RM6K(@9WKaO9z$p$nWvb(`y>>W9qSz_BU#y@xs+}AD1sC$_|S$ipejvH8ND~ zqKVu;I7o=BELJlx?YC8Opm8iZea~&UO75uY5P{SCBD|wQERoS*d9W5+yQ8{)T&z(# z(Ug8IQ#xJgzxQYLHJas@N5*+NPM)ZFvXb@zqYSy?YHbgCj#8xT45p{Bi4P>aS?3^= zSK;LQXH70UV!yj}Eq3)AI_G`w(3I1x#izX2e0~>AM%C%K*o_yywQk>u_|)gzk?)+e zkzt?&2fiYh%Sx6eXeoSBm7F3=EM@w=uVhfKAWt$4nS8##Y@Vo^TB10!^TC<|DqPvR zmW}8jq4e#;&ImOgHacv*^=Q4M>EZ43CBz`<7 z4m#~{+4%6&xTr`jNxhCn;0x+1xZF`yn5?{Di}MnROCPfM-a!!91Pe?rT) zYkQ5B|3s6|Vw!TMMV#EY-caRz!E`PCcazv@qaxqy5$2pgGJIuOQikk*Wwpq|Mp@CI?CD)q38vcmGW2QQ8D3%d^*<7YTX~m*RZ`Mg&m3; z565QWSiL3f)n`X;QNzVUr*a@##Jd41RIaKR(`(ulg?R)sPO?1zw4ek^{ z_x7@t;@Inpa}H4?9NNOmLpU@@D zcZF2^bV_a>>01mr`Hu5k>suLW#1h2bpgiUlQk-#EcHK^SV{&GvYibKzK#UeN2bu zE&jGQIz5txg+7i!JwH`$yeES~Q8js~xRcd30W|Uaa`lU=rklZn)?0t_DBiL$pnjEi z`47J{&iM-lenYLhE})Je>16z?;j8IrD>h0r>bzEhb9Q{5@NT+aP6}=Cdy1O}Oj}7H zYdlmj<LSs%A><+40%yc%IRbwee5*(3`o5`PfGYH z_{)$s&t07eL>AZd)cFrI_BA9GKVMx)U}t-=ObS;n621bq3;`hlL(cdGo*ZBHEdE!= zs!ns4S5O=~7s0NFAK^!#Xrm##HZOE4jA#5gUgDv#&zDRz>3=Z^1==hF1>#r@Q1GWW`_+Y!HFV!?Z<Xe~n(?Q+GS5LJt<%UKx+SNj*CwX&yLs-5xs7RHk;G2t zA3a$Qqu~1ZA8nN+x1!Vrlcc*mWSD=x&3VI;qkYs9RV#Wpof(&$-RMKpI6|3 z*Os%0afW4ayJ}ct5Zj%4h!&s&UO-M(i$_KO;1g-dojd=|!4~9N_s%YAo)>|*a`B{A zHY@V(_?*Gvw~o?jrhI>26WcXPyBopx!t8_|d)=>p%x>RLM^e$wH`Bb$-L%IW6Ak76a8yf*!J@|D0k zr^k!`IR14Tf7fqg%I~tIKjXT@Dlh0R#k?_lXaWpog`Ikazwg#~JEyYwu+Ne6R(|@( z4!1#v^ymjMrOo=!*6u8AeENfA3sc*A7d*di>#9b?7rb~UnhDzR&+p9+DFd7gGoIaT zih}jL&fU?w%73luiTFe;a**}I2FR~J98T_wad_Dmxz(yvHCyYFwm9&X-v2qo6!K zIa=%@Tpq(RwL4DABgYJj)v^2LVUnGhU0Hca#%Sm5=X18)QthI+yAzsw;s4+Yb&FpB4x;S4EPy%2mVh^mT?4;p1x%*LAZUq zIA?m5<|!A;L652=eO5`r$8nPy+ky140be7K^OyJy?6mTG5^L&=lV^tQ*H1RaxnBK2 z zR#wKL?WA2(66!(p$VxW4?s4e+%^aNlL02qTY4bn{<1X)=TZi#`>Lfp3ic!a!>mc7> zbf<-!SIUigVKNy!Xb?-HNsWs8deL2DJ(U;T-xK9xma^Rkk$2H)?Y?<8EAGwI9jef=KrXH*<6ovd7+BFdF6ZvV>Dtq&247ysr*KrsFNW(_}K1c$aJS1e9g zKY$52O`)q)O7E0oX1V+ceWmm+PBXKmDi_df^q z={H^K_U)+?=6H+k`BWL+{ZPF@+0XUVM!ulXpfb0^+7VexV|+_$aYeoPp!nww%JR&| zR?GLLh!mA&r4Q!#IZV$4+gg8ZBz^6Zl}k0lEkc{f=)q*yM1Vdxq(1L?A&o=(A%k49 z^7$(bXq;X|0xrQ&uZ?v?ddyJA`%AsIm^FD`pHCj;upB$ltcn%tJooL@3@ptOU-;B$ z|C@Ga%Mur%pGKX4tqZvajiIsre8xuMDoV&P%m&r?`=zeHQpyXN-`GeGCH;~Y{0`qf zTRc3d776V!v|03V*^qn%L%Y%><$K8f+-LS%MywCoLjyw+2HUR_hYE%S*FTb|pp zL3zb3pg);1PW6)?!V7r}%#or6nxLS=`1`$`$*gllU5e+eO?rKTn_jIS->eYWu`yU6gRz+t#i49xw_w4u3}Tm0`d zrP;fU!`l!MheL+~%!juGg>_j|0NOK9keH6Z;D}Inx)$F}?&93 z8F!{u&UDoY<5K|(Z9`>+)X`5}{x+osP$%Xul`YNha`3wGeobtU(trK_i0gn`sGhjZ ze~7S*m=EG;Z;#N--)|9&+BK`c`6H$K#wUK;Jd*R<#9StZ`MWvCnLs1w;u210CWQXp zYQ_-shLb6;YpRW@v3IN_p}42`^7owx+_DqNX(nkQ9fDUsN#@d%w9%mCFWtSS1rd8u z_78k_JJnN^ACH#9H5b0VnVj8Zsiy4HK5;7gLei#XmLx|<`9a3jvF9rRwR@zMVgvf3 z37s*9>Lqq|-K%eik>uYOxbbxt+)cb-eL*{H5`og`REI@y6?WYo9Swc;g#yJfBz1xu{UM1(;#0S%Y0B@YFK(^2jtq z*2K0~9k}=TE2++xV)0Yc;+h2vxFI$RAy|&Q6h;_NekRwCY~Jx5U!d;-EC_9We+8-X|mfj zQ&Js0U)?{AH5dzOLt)m_`2N)rPv6rWYl%PSMv=B_x!60tRSDY(sNUlq`+uum{qZm9 zQo1rB8MRr|{k{H5-YYwA-s{Nnr0%_aC6GM8N1*aU`ACcgl0WVSxHvxaiZVtXcRgP_ z^9LAJsDct}=t(STy%K&i(YT+OqS%{9qI}=nF3Tjwdc<$Ty>pnBS8d6(Bmq z$+8^9CB<&0)37%`GPmcB-bXg>HW~F)ZRn)70(EwMYTQoOz!*W__4Iu^6M@fb!JUOw zc0wt`u2xx5*UCHJ%!~|RVfZ1Fwb}R);tn!uNlWC3JPA_BFjS}_7STM3WDJtW(BvB& zS_;X^$B?rUi4i|vKDH!&Rf@Jz{pSHk$Bm=JkYw+&#}tjq0;E|f)dhc?4tF@J$(ys9 z#Y6OHV*FOt1rnsgJlNb3z&(pyP!aTBr(Ypjb`erY^7APJoreky9S+(-D-yT`$q)R7 zN(M#E=)rN)iWZN;nltS|qpsV=laX+qJKL=DQ*Y*-C>)C^b_=;I1Jg*cA9Y zD}SZlJ{;t?#P=P2<*l%oQ$t!SVdV?bXF`=&5UuFU=Y6|Ei-!hNwYuS7qI}NY6@cE@ zQlay?dgITcAf&vdIrK0*DHv7X%N->=Z&B=kn+vXQdI+P5iA8Hl>?+jZRZH)rBTQ9Z zbBRECx;tsXU5=Sg<$3p>TEz(0IlqVbWD^-$DUh`F-DI>@gdu}ia^v{c(y@a<7;;e` zlAkP(>7|1pzrXjIej=*XYH+OH zvB1J`(8ZEWacanZDa&Hd9XTQhVQX%FR~4QlMKgqpE8FfrZ}rNS)#vv|W}T-`eO_r! z804WsacIlP*0LVNy>x#{P%{>RXqVeJbjCyJaRnUI6?vmR*2nvA;Wc^|XaDV$f4u0u z0t2-9=lRj-{Yll$xx~FlDl8Ut0C~p8mXiVnsw;7axg$q`ulo`?z#m3NTJr9?gDuI@ z?SNR$tTX8aBSZ^9IEdp#LqOl#xZHOXB0sX;f8MShy^!d*!P)ce;60XGJ-iFN4XBv* z(wjo`OqzY;C{>35Yas@BN9Mb}s^cdJa-KRjDccn>VLZ`8XXRw`FKXMbM3%Wd)Z?r; zg#5Ijv?A-_JFz9R8X zbx3l?*CXn}VTMaYZ5}qC`wVIuIgh?HV+Oj2>*}5!(L#n=6FWQBFIwKr#;kjq{2a-T zTzrnOEjYzb+by_Tczw5bc;~u}D`|@N_RI&;N8(bOO(FT`%O?)Z-|ufxQ?$#d(V!iN z1g`Q-ZX~6J!lt>J-`y5`h?XuJQeu+V9nAU=*P4j6KLDV`u>SW<;)>!YKae2rf}Iw- zcR1aCBeY0}<*jXF{qel&h%*~r!btrT?Mm>%F!R~Ua71X-uMi==eoc{ESV#=Y7WJ@Y z!|y>EW8ea&vG;7t&Qqf55J;vtdis%;J-Yb*MWlbVVR5EI`BN3H3D84s?#Ob~i@@FF zVm982m%|B6>Q+Cb_D+BF6LV2)FYrce(Po8(PPIRZ zl!QY}zDl8-2Zz=jVq~CwbS#%colY$Iwc4HkGTxosxvBfLCG4Bw?r5VIA z#L9HUaA~EraFF}otDJsSdOoPVD&POkK4Q(sj2%J$bFRij{U3ARH_Y8pm_X=Y{nQ95 zqO-ipE3xuiK~_He!OTWs>?T;}4{j%0`@KJZzn&dbD6l{O?fug|vY!f9l>60jMhe%M zBaw@BqDn4uN(_+T3REkBv;(g#{nTI1JP5Ei9~3VIaXDFXh&q&U```lT_KyIPzy%N) zR@fj9SIPE8_{azp`&&4CUpRNv68#s6SnIH)RqwiTZW$?b(WwHQ%@+=3+?C7*=Avwd zzYe_PS|*SRO^nI$`8LejsLSdY6G5(JEBL`hwPR=c5xOj5{tEKOLTByvbg@|rd$#D_ zo?>W7gQq)+ft5*K>m6&SzE0^8jx7ZbyaS7 zzJnmw|4!a-p(JbSeS?tzwfVEx5e#`p37UB$3f!cSazph7JBUmR`M`S{*79Pe9}gi~ zc#<4_3ekR$$vxinuDUDX<>v^I9}yf)RJ7)5?EjE?CcYd(Pd_KAP70)nbqGu}EzzBE zDdV9n&wj>FBepZ_NS^OS^@Rcrs%@B+?JstDhP8gO{ZBg@UjCrip!@x)z;LfdVx~aJ zU2tpREqjubVLvc|HEQZzgu4i}Aaw`a{{~x<8dP92*jfI%#{B($Ibk`I+4mEzY!v4| zXDnm>6QsR_fb$8+IUjucR^XoFaPmGTGxdW>$3+}MPV}_UR3R#K|DW+RI1_C4J!Ez# zuO;{PEyudkg(U9Rkb|mm1lL|8UQ@T2Xra#IW<`0%BazAS-3 z!F)`nX-xex=Wci@X&_XuZ8Q%aZ{AC7`u!p!g`Fmwj+@y|`+)F=P7D-`2D4xGBW zxPSs_YrIKEoQ$HW`|e4_T84&wckBaIWZRD>mW^4 zRWqw56^7PCMsRo#U{n986pH2T4>k9ml{#NI2@wKd= zdjI2*zr1>&EhI_*PrQ2n=OYkEOu|1oKCia&;^7=~kOO8~ctb*+5@@bOmabGRG#~aGQY~Hq^24^B|01>JhvlH6-Dg zcLDwb&AS=uf_=zW)upL*&Fbj3a4R6wV<6)EL*tVI`&a{8@bzpL_p#I zaBdQKK7}&p^S~0M2rB=nH8M^YPB~r(8LFR>c?U1B@fZ>SZpytV=(#hwu|*klxeT~c zRAjsaX*++nAL3}c!ddBbJO60Ir@QMDAOQe4yg8IUaWiAZ%RPGq7;HS)Xz%~bbmHo~ zA{p$zvY+(rTJ*#d9$VZli0n=0wvI4-`e$oW5XB>kV z>AZFt)G_lI=`;0v?el$l)T1+b{f&unp1!UfR;x)@0J60HF4=rM2ZZTQ6seBBJ>TwF zulD!%hd&yeThI3v&JY)hMOqmdNdmel1Oi8H$BCZ6Hb@LxJnYD8krClJ+?3L}3*NoL zs8cFjuq(I6(LYxbODY3JWX+xT7I)yF1s#%65zlL-hrV9Dk|1aY_8t z!G;kWh71)|>DAb^L*qYM1d-=fVTY?lyz(nBzMyemclf zy1vYNwDeCe3d0-)AgNEnucyoP*DGOv>gsGpsqN?8Hipux+D;S5 zNmSpBsBb+ggX>tQs2Ru4{W@cLLNqP4N~X{y}v&?m8;$X)if+{b1nYfn^x002XX-?HJ$$m3#hq zQ3l1c3f4Iri!ghS+TB%CV-GA#8}72ZDS|K^ zSS;bK6JsN}K|%V=U^1pgVD0t!BUviX$q7}7g*eF2R~{kdXNRI}0+Mm!v_(qk8q?yj z+&o@;(Ob#OJqeRF(}h65XzulyBDs2*TZ2l8G1cg zB;KIkIE9x7<)Eemw1M+9UDVtC;~X(%>L;YL|h zoigRHql!Za1*}BglbW0$1CeT`|3NcZQn`&``|q9KmW9~CryrJh!%}Q`TAF5GPVc=P zucda+vF{D}+bG$H>F0`d!@X&{uDm$uWNBCC!uU|K&GID#p#aGgWp0o;HEmb|)xim* zjvS_(%v^LkwH$ODJX;{LHpwhn@ds&|;It&Qj;fX#4k^p>m$!hlghf3=TE{(l6;8Zm zQWDHW+DczSlMBf307~M4t(s4V-k@gl37+3Ahi-n+>L|sMfEIJg2k)9U6i$ zK9nZl=((!uXoRMoqL>WObw$-1Rv3c-g9Twnhrzg?^?ysj@da?usa@B)u%Y8jz|J?U zlURr`2|wik9mcx|6j?@vWnC1bVhVP{RNq>EQYwdOb~`)RsTp;H4KHVb0J@Ib3)r*x zKbI~pE^;H2!0(R%gE>xdCwLB89bPL1RJ7oMosc2hWnfu(Y#N%s)qYe-nJW2bHye&G zfN?r63tEy)_7mtVfYK!;Q^JOF%Pm@Ixbsp$T-6=WmYSYopg2T*ufR4C;c-{6U9Mkp z9?6_tZ4VNyf8i&BN}HN40Xn~=cHuA@PtooCBx+zSLqbB}wQ=I19b`|KU0VgbsKP+P zfQfV;3aaw@> z<*({zh4aGI=>#fS4h~bE!bvARcc<4=ukHh~WKVpE&t)4Kje}8vs;>i)N^7zJB|BFd z+jcgtn8c*~=PPLkv&-jQZ?fQEaHS zo{Uf4kCeLC2(tt`UyXQoXa*J6n66*kNBbn-+oLkwNhl63eKWqsb3zn~0iKC7C~2_a z3J|0&EiIWgB=(&;nz#dV1@ahb6UGC|u&dUlqM}UzzNWg1Z@$9GT&I~Z3poq z;xdT(5_f?5u{Z;Yii!%-B~BX=A@CK^s+AsJKE@IOEwPjzB3ec-~OkNqN*ywsI zdnZ#fS=;Yu$`2&H&QG@7;Yq1E)09CfIdWuxVpU`UGTi&S`}H0|)t-b_hfSgT!Kl6# zp(W9Wums5t03Zi(&Lxk3%A`@GM40V@XgQQQq7B&%f{?Qd!uyI3F94mdrtJ>M5-o!y zgtiXisBXvNgHSkMn|qF7zobRvVGlzc5(}Zk$p2FP9mDc@U@v!y9~nk|xD9=X5rpU! z$c`#2ngeK|X#BQ5johDr#BPTmk2i;(5X~SG6O=wgsg_Sa7asp=dyB7JO6qbin%2Qm zlg!0hn^|3f?h_Q*i=0q%rb2rPxU8MMea^`S^?JwOE~I$HqqudE)VyqbIqtf|a8+h{ z8^zM%JKvok8HX~iw1}Xb(f8>>j#d^)2wu@R6gM^tvO)O&cD|*_0H*zN^va*1Y7x-! z5e9!-7B+OOdBE&TYix22cY3>V1fZI!$zm#H`z_ExxYx57sZ&yY7`-SOYAE%y|f0RCAUkarv;gTpW>B>Q+Tg~4Dv z2N*;X@^rKJ48-+5B?5ye_UDDzq!$QdR2u5F^s&>%_G#;%;d@o8$++|TrAY8IKQRL2 zpQ)h%4_p|&5oW78<}X@qZISCR+3_;Y1H+R2(jzaZw=hAvt)}b4~?Pk5j3xPA| zBI`i}Z1a7WfS`b^ugxRjoP|IhC_07Lpi+-Bwdo7)sH(5Re|kwBM3q~7e~6whhE0xq zpn#IeDI0vdYr5J1cj#}Pa;GFE(bheP3QXy_ngZ-ys@*@E+;(?94y20u3=~g05D7<< z2K@>_!(=I+2r+M@s*%`UBG}AJuK&~IL`TR_ieq^IMiTY*xv!UeR&nNQ*t)|goS#e` zRc@!%7hiypPj)l?hS0qtGDN3-8NAm)(4m!OjpEfFH@-c=<(tr2F>lv=w2U;;PU*Xr za6?&ttxhGn-2A1at83Wq^_Twf0>#K9ik)9x+z9h__j&Q+1L?H&nRnD4-=8m@1k8Vk zk51$s$b0PaQLBQSq%wBqCrT|<_WJpgLvzp(^~U6d_D~|WjsWl6-G)G?knzb57*j;Q z2;<5y@cHU~_qk9G*VTR%p6C3MntA|mTE8PYr<`>)C@)t!L`nQ5I6}GeQuJ~R_qIFG zuPL5ebwOt6_}TsM;QQYN9Dx`{E$8M8LhRC5o$$a{@6K!EDnj35cbBKZ8gDxW?d10> z&1HQmG=;3ujbYx;DRqmGbXE<)q6UAAe zKgntA3FTxw0ehwQ7#r{;V;UJio_IgymDSIaP&%l|Tg(-it*pY8tB71-mp3N->7;66 zL?J^Fy%aJ5Hz2jwf`5L+Iamvy#=uybcIrLZQq1T+&t%a zf_|Jx27kxs>Or=dcMd!COauhO7bD#0P}bfyC0dNnZ`xm)<4874VOX-WE5M#aN414K z{8jVLgjuhG5Y|S$F19B}i^itrOT_euUg~YxuS2*3!@y%*shgt>P@9=sXpe4R!Y zGWqn$;YVU6`<>k;)-h&%fspssTRFE6z(f39LSK!WOgoB|0*EQHba_-ayIWRwP#&97a4;EL=a=pavh zB2DO0m-Nh*oYvIC%B=~r3q)|hCL|m$&T&>KNh(o$(5~j6dkpH!UHYjSCpiD|SCPam z3!c6>&e0&khQNJlSCVYQ7vxf*aVWX%qg}d7+q_^Fq;0b_3fVo?Kb}3IPZ+DjV}zjS z6c6>04K6Ug{Av|31JH}tgI}-~`F31o*#@B=JwfB*_Y~CjJA+*70-pFU4Yr8*=KQqi zaFtd?>HI>O-LXVY6D-FkE`ctaq9-BFytJy!yZbCTJTID(5iim$#+Dr%)g7}`zePX~2h zjkuNXjBCO#V3?A9IzPKd_@Fw{Lb0hMnTo1wTeSguC!Jc<_F{k{lQ!o*!R6>$V2S$h)&xEOOOcf@Nyt8rwn~?HYxep&U6dLJ)HFrQy=$~j@=#cTny|9a1<!tU*e`2)~q5rdNIj z@NrkA0B5Ggb{clDsI@b;d`K;$DUJxoz}9FHCP%NLLNh3;nXP3$ta<5m309$z2|W zy|EP>Z+u^`BOdeVBdI-J4gLMu6aCi>pByS2j|>B5;n{E^>xysRFu%2rc$a6uR7Q#< zBmmcGyK8~^xZt;1fsLWwr;zMcqKmN*QfYJ0RBHi8+#Ti_X} z>9bEffHV+PV*O2?8wE4$j5VI#N|Mha`7ptIm<2!du6K_m8vClU!8mT|#q#iU(d}@F zjIwi{DH6uJLZ0ZT_aQm*oo>I?QOqZr8J!#M_G~0rQ@8g=m$u{MHwl%nS2185iHqyY z3$7FzuS>FDhx3@w%)!Ty-Uf}ylc;Fgi(xdxgl=G4JRfTSNS)P3dO zeLGpzTzVa&kE8AAMGM{~a|WATytPaQH!bs zIYZo8dlOKe2{}AaB-gI^dgYWuzJ?T%{2Itif728CJfx?Is0tO&7M6BVYD;A?@I)TM zmZK4#(r&~yU55#W)aNaJ#q47**F(arA{*^)dJ?vkB)Reb)b*8NaV+h&Gq?@zI=H+0 z;0_5cAvnREpn*XH1Q{Se2rda4Tmm6LaCf&5AOs5*f(6L!+50=^p69vu{Fxuq)m`0P zT~%+rYt>qiB-L88Qg!p%MdFTUIQt|&aejwo!)8ibIB+dpO_nHaYcDbq-Ri-qT~K1-SRUo1KCEWTMf3)_or;8n!`3fc;oM9=|0H4ma(iW^5%OT zi}tIW9u9l2vJL6I^I@_6VP7aQoNYFQ5;1ldbG2U27`(0Y<8xJ(P#|%+v2soFHT(hw z{n1DCCq0bLn^9AvGG%vrlRek=;8~f*>!4B4{e*-q`V_jFw%6!zW-8u3s~!|H5j7+C z9WToW{}f8C^(Kj4a)CdvKcyN6t${Fz4f1;T%L{ai5<@8B^8v6q3b`EE7qrqY==*B- zMaoCI*Hl@xnP)VV5n-E%Gnh?7Qb3EnqYfQK)3@liwcGhR-C2}U+i}f`83BFfV}o*s`4}w&buNQpEgzF@ z>50@GS_YHV-tlvpQe)c_lLev9%LA`%S{+Kk5^*sXbC+1l&SH=Eaw4o$gKj8RFUC(L ztySzCq6E!g{zgR_Z)b=#n8B!#BDJqEyz{41-&EGDeyUjpNXFLPCc2%V5kGPeOKn-t zP&U)GF}f$J5BeiqsAy07r7~GvX%uZHYy2i-CLxv`A^WcGAQbB|qOq2L*05;0wZ}z) zE#;uaRoP+@m|;)1S?IS=9r^5GX=n|F6w~ydWu`5P=8~DP%k#lTD0&gF;QXAj@^Pk! zYUwR7mOZ29a8*h&*EeNN!JEuspVXj(y!PGWdAzsMTVp}GUMe47B;{T(U>akW>VDYP zTc|}z!pW405p6s;^qR2^IYHC+_B=tGc{H68agHtVRo;jh5hObjvJ?aZ8g_X}=0j=Z z7^9S+d$tHIM<^Q8m>0MCyzdc~o?p|jHJX0Ymn$#!P~vYA8HAX937OAYNt!2#Bjyld z$%obcz!-G@k;rq2hpsqE$tN(xd;0pxJ|4mJH=Cb?biXYp=6}~{Lz@pM+1D9yS&1MT zP?DE>LqGPF+zW4aS(j-&D^IqslzyIo@n;hll*V)dn7X0hPdtc^xs^_vF+E12w+fPMAm=7LRvuL{o%Ej zrM(B$-9=VAbBoR6z@MoBNicHNj}#~s-X%V43pc(8zf*qN%y|mG+}rs*r^R;sGYclg zbu09U9zRG{^uGt)J1F92J4ZB2X?lM0v3fD=l&ZIg$~aUKd-kov^uZI-JV8-tMCqm( z6$;QZ(-nVe1z{$G9PH`#|o`2HImvb(Z0bJ@QBWU`w5wjG>qq9I_sPrc~cpy4HTtgt`K)3wMrJ@l{MxT8n$>;o%u%~8a%7)t&i;j>vTn}T_5=G?tq1Gp{|rl=-4%ybpqN< z=J?+~U4L`rRSfR6A5YvezseuQ9wd(5C*imfDUAvQ>}YK|C(Q=wi;9 z+&^%!46=eXk42t`f-uSoqM9f#DHC*YW&zY`S9t100?-)2A6zS>O%$c;FJ|wUE)=40 zf{QMrsT`-i&9F|7c$;f6x8nNx?676FcOcAY;uyQTk2F)ElHQx5UFD-{Y?(U zLdj0iKR+muOjZAjTmFl^URrMY-Dai&6G<#hvZ*HN2VRM-ifIaq)Qa@T$SKfULpDSV z(eW!-0#mWAZlax(TzmDGRM7>|9FlkObjjjoGxyYC!Pk&)1w8gsFJJ zQR6(U%uJt8_M79IjRTH|6LSP@J}g*)YRKelmM*C0scGS+fm5D%1ZgarvqY)g+w$Y1 zk*SM;Iy8Ows|s8Gi(4S8oP8{oth&pxP!I&I6%fniNd2r0O^s<;sY0Sn#174_{wVQb zLR!={FWHg8`tdEzK^hP{ zTbkJ)WflsXL1nQn-ZUAMULE|RgOAF;cqg%_SUecsk|nv48`}b^Pdo7x`J=JgJm$Yr zu0-pCfF%`W_;0OdXB;=Cgp~y{i!#=6V0wsRPdN|^G_`=iM1cj=-u!>Yqo*&ho=(rk zzmWkp)=%jq6-DE=2ukB)Y%!gz0LBMOtToCGYIx`>opLBs*yWv47QlEzG_ftyb-s+1 ziFFaxaq|Wk5VNi4HL^4XSa*q>TvB0dTN`26_Vi@vsNeN7}tz8u;UT?{C5^*Y7PYmoSH*v~(kX!<0l9KI4E zQo0k9Mkbc%yVUViKS`g%M-1CN98SRn-#Dws_BP9%1b*8oOW5M(ov! zIU#7EFRmO#u`@eT^SV-#<0E+(u_7s+p$&MR6fqWHM`^^K6wm{@DTVkgTxDKxQ!nx) zUDk%*ySAqb;kIDKTW!8v`Is|}>q(#$*GGki64Q06mpv<%P*;;jz^Iv2L^4E=Tm?^j zC1~Y-mT3$=FX|~N=L7BtyEpU^CZ`q z9--5D^`Hk{zWbUG`!{N3yH_Oq&3hLg+`}5H$+v$4=5|P0M8Vjwo6?HOqh^)1jm9uJ zw4bdE;%$o!m5Vz$d?K~UyVyFfyD8h-AgWt<_GPon%uq08@ZGlh@ZSMp?BSG-;|@PA zcD}bMUPK6KH3o-c@E-;Qp8NxmDi_q3)&Pcb)J~qWZ27#{C$=-}`b&8Qzrc_s5iTyS zSr=z`!`d;TVt-1I7tKEX+0=KT-n+v1w!sGy1o_j3ODiLzWX7GeA~E+)fU?0+CVIfF zs_J!TYGwUMml9tCwo9FM3&TQbxG`CxEg88f_7QQCXM}R9vA&W?st~oBCPILAB*Kz= z*n55At=i_@?Z5y1(H7Czxgl&q`yId4Cq$V5yiAX!9tKz$gdXqAvJ;^4EKWrI4`^i- zKxzKjviCpnmVbC1KY?w8|IeTQz%#%P+D!@~kKc-0HOx&3`ejHnp=b9Dk(OaPb> z*3cNe@RPA*7crw&bo&W~PQWv3JV$&oU)I9RENF@y%1(u(9SEC^#R*0YB+>}`(c%w1 z`C!17LBJpfRDg@D0BAw%-b6}aCvD#MR0hcfaxbJ1acj3MDPtV7Z-3Je=b5>TADvHh zy93X&axwu+sHJrrlX402Q|l4Xc*AWvDlF52Zhy~`($N1lt45a#DAv%?4#;a58A*b& zi|j_uv|tMs)l`bR@3Ljtlswly3d+mN%gVmEIsXo@O`d-A`gR963j(J(bzN9;@qftL zLUONiaz2IK2eYMTD>+ubIotmAV{$hBH+aaSH3UkOZDt=SWR~5V8l>_xD|T#CNNG&B zEIqN~`A>6Aq3}=3oxo#*R@_?nGqM)6&ffje4_|f|7pb4KBR3qquHUe_r$ziG6#DeR zAyw3O=%@ktf|(n!EGA&@m8G|V_X;DJL#Rx-oWSAo!XBBw>$r}0h0O)@&+g621KtDDykuUe+7I0{MHktn!a55Vi z8R7c(^nT#$*2|X(x<36@8z2#Qx_P!e2nfQw{-;_tDd@@9uJEnCctCOd>`)dd$2XWv zmy?}shK{^d5=w-bzHIQt-eQsi^$mbP*^}PLyH7q0Z%9g5wj4eD3BSpxbzfb0QsBDU zlKh{&jxxWs<_$c59_^pJ9b3rVH=Li7cIEdgo81ph^Seb7!a|*ZFu^VSJD|lF(o3_^ zorlbF7YqiDd3ZF>1N#V`9{>+hrkf`PP^_FiK~+g( za_2<0Da=JfA6hr4{ltwxH*Xg^c7fFN38(>e=--q7y~;QPj5s9p(Bf-5Dft87BQr@u zXBV>5_3*p)on#Ht_^P5o*a(FE0*SNU9#l!gj{vWi|5T5>!Y?!gNO;psSDP;X2okS~zZS!bwtGTUez-Fhz$43zP8WzLjIwSMTArB;j!_1QKJ{j&T#2i}Rs7HJ^G zL0(NMza6lS608e7MS4OdiEl_iK=F{PNQ#bb=QgV&j;@d2 zMpZAl`^N6$4A>qMk*g9d{>7u^6G8A307GxUWht`5A_vaUG)6;4dXJ*_nz(~5R;z!I*|qG_Ebd(N8^s9Y=(Ses%# z;$C0)CgS`KNIuL)P60++zW_i$V^4jhhb_m=XGVh^DIQslzlT(A4gUtP{>ZB8s33;p zfq>-|MT6wz>QxMgkASC448n@!yKUS z4nX%7X?*1{ni=8K_OcHT&hgD{f@fG-=H>}hq)^nx$RoD%JfoHtfV|hb|2WJcxe@@T zb)N*#%sSG2b&@5v;+$524v`T29cPib<`Y13`*mI~Q+meol4qPU2r!a*C}FtYLlOjK z>0lT_ESHpH5yD7X;L>V$CUmSW$L8plg|r_?^4;%kfGCD%fwL~L>iC|hdIlh`k))$D zd_6zjpR1s8$y@qz0W9BnwlGV1tw}|FLWiu-HEav|?g79%=IM$q(2GAe1%uUPw2>VR zB7Y3XU~%8Z0{UvJ2h!z?JyF2Z!}u>v&l#2SdciCLN0ukS6!H#RMAnSz%&6*>6K@N- zeKS$iTjCqcUU&KGn9o!rL-(D@GsW{THQn{nA$Mly=qoQhOayaV#Yfb0Cd^7S3)L3- zh>{f(DfrQI-bU?<<^+@>tjw)dCcml9MuResa{mkUNCs!Qno9RzAkQEWJ!9S>^|%Zl zDh)?FiMfTV+q0Io6nk2KWnMNoi(LfnoOCgp7`}tE-z=Hh41sbIxXz`rKzJ0N_IKTl zlW7e(f~ZmmDOs*Hlp_=IJ2~K?KV7Zjh|eX<*l`reobx!@a&StMH?{;V|Gd^+e{?uE5aAY#7lq?$ACvD8V+pVU?WzUMjion$p3{J; z9;&;v)qH22}c4JTMS=Cwwo+Eet@ZK1(}%kLO0^vF}f$3$CP7F=t3ID+)g4&xBb4R z`_L4VDThyknwB57EEVNUfO<-$^<0|T*3sWyte=FLWG0V4Q_@M@V6e1?4iR;yq>EdO ztU9riNi3K>qcbJdJ0r{W`%+GbTH_`AL?s6hY14YOuJ?=JY9)5!Jqm}S53o;IazHumC6CuYb7t1;LR@uuVuoqroS0Q40T==y2g zn;!c~9tIf$$(bV87_vdNDG(|9;KkN=Mo={!0CRuswq#uM%#ZX%8)e+U7$ofA$d2m7 zIc5w=Jy)tXUfepT)Of-!pJ|h3IkXCl)@JlY8m~m8R}8aURNVoM$OOyBaU9{|av#ps z@DNg}5ps%OZx>qUE_+Q5#*E0BS5iP|+;1LMQ2S*O&O$9FkWa(U8{bjqfX^Sqnt$s% z*A0+}u5K$l40R3I7mcoUcimZLk(jMN51qsS48^0L_A}MYVj>*Jgdiv+w;%AJ>l@2* ze|r&Z-~l2~d@sDc+qg{p2kGD6{Kz~)FB6Em>T zJSvVUe?xmh>-rXvl{(1h^NsKi4@PiItavv@R{wjZ+?ZI_xBP>Z>$RxrBdusyRDT`- zFAE;Ly)lwGXA#fnJt*HwY8!cbQ*|{*p-RFdulPLD8;ok)!V;{;xn?Q&&MXhBi(S$j zWBcMy`XouFp&e7`!~1U2xC9kUXj<8b-Oj|XCG$3!43uEA+~w)_Zw-ZAx@ArPHEAUY zqlf6o{Zu_?H&WvRF_UJ@5fHIh?7f&V7iDCsoX}oJ>5FhWSSE%mk69qWk%A8)*j z7lNSo1wiCA-Nai3dp}u$5Ds{p!B4b7*(7FXIzCQhCZ;H6SW4;1MjvlA?QXqUltfbG z715Q}y4`^`b0NP7Tq2i}{($>V&qPrO>7w{69U4>#nju4%=j(|b?#GFq^mLQ85aGA* zr5U5`6dYKj8kMzqxwco$T4%Ov42~<7g(4;K4P(F?%_nMsc0Py_~^Z zWLav*Y%UA1F#GN(FE|r}@$=($a?$dDll30$vPGTFhosshi)jj1snzB7c zVKG`AUKO&1W27LKS{&S<{X&6-M2WFU>Nm&HqWE92T2H^GDomreJ+j~@!_XR$#7er+ zVkn8aXys#ng#qoC;ZE<-taZeO+SE7pXiwuo!O>3bghH32kh^G5+BN8XSAZBweA?tn zEMDU(Na#XziqsO`>G&4#kb)>B&{F_@On*>%9<_YL&*ydATvA)wr5?KjqA!=y#}w6asjz zH9mW`>l@TCNq#V27+E7{fel6YL>I)JLh^oU)iMz*glAWg%?}Yi6Ylk zLQXX~)o)Wp|ag^p_h;z?cft-$SMV9uGrz~#$}5sXYnF-)5j=l_jD4*lg%S3&HOlvNeED=+=l zFw!Ip zTL)%?fGNaBjTj_XV_#tqGAH-h3q)*>-YLX1CXr#2zvr|9B4+Zr@4WgvNi0DH!}+n& zZ3?>v$YWIF848=gaEd)8!QKf(>bq}i9)V%x0;PN2U%>Xy&l#K8YI|~30adXK|9daY zQ8aLAt>FfOZyaFb>0NFw?kJveRSAj4-$5V6D=w@X6H_#vP;dR zv$MEXf93NrKu4USO^ASmAEqDGJ^%8Va5==K+kOB<{6z`NH#Yx^*K>%qXZFFs+dO+V zDn4gUqnQp4o4?;^CTtOdUBM1^)ib~-hCJ>W0etMu)JVMhQ;B^2uQte^_3D9quN{&Yh{)YJxx8FaqQNu z<+iei@(ilf4YQBlHQ#6cRY0f1rR5*1)SJlZ|MIRNU9CxcsMu_EoGFmjq%og4FPT{PI!Q9u zA+C24;s%$o&n}PGQINoexK7bZ8o$Xw2XS)2j4jM;@>ORyHQu&SjTSvVgD<6`EL+bv zxW07s`0UD!32n5n9}1-aD1W~+E9vc??qQ6}nBd{q8FIXm{kl9|*kCxiiUJs~z3b3# zwMct~f{%&VF^wl!9RR(b#;O~nXDgWkW+45Lgs6G8+c)+zS$hQ^!h^qoSkRpOwjpIY zUVKwHbj%f9w8bHB@Ebu0&Q!8b;SHSC!XSjL^;S904DB|U`2DrM4S_usFvOThf}DNw z;-5jvvnd`fE5*z}759~#yJQ#Y9KmE&!3MAFZ$S;{ms9aB^+eBjAwxT1QH*>23o9`# zsR_Rcgi_O$1m+FFrB998J7he%ISS6dLoAfj12RD~esWbLb{uuw%%3dRKe=jNA|hPz z6f$?7`)kS`8gil~rF@t4&|z7iAn$t*1ww>o=VV%%wR&| zE)yKZSSeZNwavp5Z5wv}UIUo%ttiT~Y{R1|DEb(oniIWXO98%G+c!OwqU1W6@(B$y z0#$9NM|aQEULELvNUsM$b*$1xxczC0mlTM0VW0~370bBnJ!z#vjASZ`mlSA>7#F0e zQ^pnGp>t~p0hy_`RzPgg`E3~m2`sorc?zIwN)n<4j}(`@;`+Ab24aau8)VFEiqO7N zB%*7Dn=3za1f@;Zv&z=kcLpi{=mVEh>R)^W7FQjl^G2}CFdcjtPVdF)O<>0wdSb|v zQBea&RH)Ii`|-_J#!@q31;ELNVbe4ZAAT`m!(zMhwM9g#8u<3BpO+Pc1=mDU_Dfc0 zZ(J9@)+yGY4&9J}i+sSbH6R2g(UmA6wPYPS*e-W`TI)M3-66u>@jTqeY29h~D^!Mo zs*CyTp>J-U9Gla@ZifVjg(@O1>f%soipqFec`Vu;UF>$)uj6YGqi-=?H9pazSq9N9RZJQ+?RJ3k+hzE8(qQ(kB%+138zE2rzFbn7B65D!Crko{v`nx)P~DVD;rs5}>p}AObUglu&L*dzGcv z29#R&;r6jqO3uK zvwAw42xdW$WdSBn7-t;KfDXHM{Vb^absV%(&JN@ZPZhiN$L?~xbGZWc80%Ka!E?=V zs%Y>!!Z$Ho$*r%_Pg^zBT%}tquGi5uY<_>D`a9=5uV>Tmy}DFu`pfA+;SDET8;m)} zPqx9yPfynr{AbO;l*q78)W1zZSkq=4QZ@TT@=`|AhAt)MBcyrSnSbR!NUdn1zj!EbIoHMldW5T zo;R5%jDZ+he(PG}d~dN6&$tQcHeaD~uRdxLWZ*(JqU z@oWndE<Wsd)X)7~Uws>CDPA1`hJ3Dox~E_8I07YAVz;bK(n@SyN9 ziNKleL~hElqe6ax5zgF>7@oO~N;+6!BYplf@^&EX`UB;>dF|6|7OJgoIeiQS9jxWh zjE3INvE3;NHqt@mD52|{tsHaaI9D#ULMChc$lNwzZVY7qy3I3}-!mR7Nc3_DbA4F( z_w)&^fuI7j|7H*#ev-I00Su?^_m`CB&r`y6uS!v)C^hX$?uAhi9Iy!-_D=*c!uCpb zpAJ5Ml54VLb2`0wh@BcZze_Obh;#_4{d~z4r(*_8gQFq=$z-48W9($!7;~Ey#?1I3 zH=sDP6woyM{;bo&Wl!Uump1ES$z3hs58}l03T{_k$$xUXrc4%9|Jqt3xLQc{&SsEC zSNq5A+B3D{+bKN)7`d^F#nxVvo)R5Cbe-2NBD;P7>abZ(y7mA7}aP7o|mXMB)KDGEdF`jdUFn6 z7yk*p$>Z>4^!ZJBehv4a%IEb8ap3bl5Y^7(K0QTQsmSt(1qspp{ce-9k5CH0?-lJ-R1X1)Nu>c;KkH&ZIcEP%INyBV>R*jyCylA(#Tt8nPMjg3-?S=!wagc=O9%LZOday z++_9pJ;H87BSXgif$^tY(-ejW0K&l#&7c$gbhLopHi$BpDrcr}(m4~9_H(~n^19^gemZi1iX~B>7}tsqZ#EjVOMd9w^6XHUDqD2(R=3)G;YT9 zFrjLvUmx)Ym%33=)mF9>au^iuO!>dje>Q!V=RamyKm|9v6VkFFjT-%vwC+%-6_rgi zhI@<|x`O_Ibfzi;y)=guE^BkQBkmN?>nr{%j8?pICDEZE>+`U{kq{($BUg%UM);<; z{dz(9a`7hq-P=$%!a|+M8MiLuPsXO+2cVhgpD^W~((c~SS8pTlvI=Znyz->C*)BNr&Q&5vFON#?f1B45$HX8sdzXVJjd&K?4`6#NhKtk~e^{Zl`n)NP#z% za>2PUZnL`X9MrG%CqB-GIit)C6;6ej;@Huc3Fsr2p{`Kub^i`sW!($EDWdl_0%&4A z+BNW%x~*Mo=sUmxjlOk?+O?X9Q99muD@jZlXq+un^$boLE6Z!O(zh?lVpCXr@a=3y z$vB6v=$~>4OCuT#Ml3lzhO$}Ved{qRw&>$w#egGM(7wxbO(H*sqP(_e0a+!(YLCBc z_&tCNP=><{xJWzGK>Fg6qiIWe#74WcGiECA zz0R}#DRzBeh{l29ayRobYMcWD6g%_GrVd*|00^Qq*VR080M!J zq?D{MtdV*LT6gp_%uErAmj%s;dCd(B_Z6j{Okvpp)K;PpJKN>%9Q0=&g>tj^M33;c z3=b|i!Rnt<*k8?K8LeKof9PNPVroygJ|Rv7;DI5cez9gfQAAy9 z(pV8_cS^m`_|NP1-#v(vgCfSYNcNtT?&xThBVdRRugIZ ziChX=;DneY1M$j&3$_Uv%ZC9Pz+tHD5HzokQ?n`a#w>^6Z)&0=FVYhJjTVK;^nIz%Qs<_7*2m9WLh4#i@al zd`wtyY1Y@&t-(=muxRzL46Ir_{M==+QT-1}UQfUL^Em;-@8p#f{-GLPK$;`i7w z-p}SAo-#v&T2q20`l_gNsF1k1b$IySwKm_u6b8>`^Vxlo=dp{bJcn+co@K9n7ztkX z2J)Cam(VMavoxBI!X%LK$3saAbakj*^|0`Vo?*S;Z3lE8iW2yhE zO92pU{tM6l|D73nw$mH$hmfy3{FfP%=&|A!_6RQG=m|D)Wp Z38`exZtlT4lm-fcG*onzYZR>`{|{ntJ`(@{ From 06662bc64b78c202a47bf358668001d2a1864ee6 Mon Sep 17 00:00:00 2001 From: Kevin McCormack Date: Sat, 11 Jun 2016 10:01:35 -0400 Subject: [PATCH 282/320] typo --- docs/DEVELOPER-ADVANCED.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md index 41b20345d9f..a12f2e4c9c0 100644 --- a/docs/DEVELOPER-ADVANCED.md +++ b/docs/DEVELOPER-ADVANCED.md @@ -6,7 +6,7 @@ Note: If you are developing on a Mac, you will probably want to look at [these i # Preparing a fresh Ubuntu install -To get your Ubuntu 16.04 LTS install up and running to develop Discourse and Discourse plugins follow the commands below. We assume and English install of Ubuntu. +To get your Ubuntu 16.04 LTS install up and running to develop Discourse and Discourse plugins follow the commands below. We assume an English install of Ubuntu. # Basics whoami > /tmp/username From e66c51fd85d2564da0b9711e12fdfb522c83c3c9 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 12 Jun 2016 16:36:38 +1000 Subject: [PATCH 283/320] correct regression where clicking on unlisted topics does not work --- app/controllers/topics_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 1b58942aba4..3ffc9a86a56 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -77,7 +77,7 @@ class TopicsController < ApplicationController discourse_expires_in 1.minute - if !@topic_view.topic.visible && @topic_view.topic.slug != params[:slug] + if !@topic_view.topic.visible && @topic_view.topic.slug != params[:slug] && !request.format.json? raise Discourse::NotFound end From a36203ff78b19b99c90b8dab8af4ae4ab1533cbf Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 9 Jun 2016 21:33:17 +0800 Subject: [PATCH 284/320] PERF: Paginate public polls. --- .../poll-results-number-voters.js.es6 | 29 +++--------- .../components/poll-results-number.js.es6 | 2 - .../poll-results-standard-voters.js.es6 | 22 +++------ .../javascripts/components/poll-voters.js.es6 | 46 +++++++++++++++++-- .../javascripts/controllers/poll.js.es6 | 5 -- .../components/poll-results-number.hbs | 6 ++- .../components/poll-results-standard.hbs | 2 +- .../templates/components/poll-voters.hbs | 12 ++--- .../javascripts/discourse/templates/poll.hbs | 4 +- .../initializers/extend-for-poll.js.es6 | 5 -- .../poll/assets/stylesheets/common/poll.scss | 5 +- plugins/poll/config/locales/client.en.yml | 1 + plugins/poll/plugin.rb | 35 +++++--------- .../spec/controllers/polls_controller_spec.rb | 1 - .../spec/integration/poll_endpoints_spec.rb | 18 ++++++++ 15 files changed, 102 insertions(+), 91 deletions(-) create mode 100644 plugins/poll/spec/integration/poll_endpoints_spec.rb diff --git a/plugins/poll/assets/javascripts/components/poll-results-number-voters.js.es6 b/plugins/poll/assets/javascripts/components/poll-results-number-voters.js.es6 index 63449af066a..e75ad84cbbf 100644 --- a/plugins/poll/assets/javascripts/components/poll-results-number-voters.js.es6 +++ b/plugins/poll/assets/javascripts/components/poll-results-number-voters.js.es6 @@ -3,29 +3,14 @@ import User from 'discourse/models/user'; import PollVoters from 'discourse/plugins/poll/components/poll-voters'; export default PollVoters.extend({ - @computed("pollsVoters", "poll.options", "showMore", "isExpanded", "numOfVotersToShow") - users(pollsVoters, options, showMore, isExpanded, numOfVotersToShow) { - var users = []; - var voterIds = []; - const shouldLimit = showMore && !isExpanded; - - options.forEach(option => { - option.voter_ids.forEach(voterId => { - if (shouldLimit) { - if (!(users.length > numOfVotersToShow - 1)) { - users.push(pollsVoters[voterId]); - } - } else { - users.push(pollsVoters[voterId]); - } - }) - }); - - return users; + @computed("poll.voters", "pollsVoters") + canLoadMore(voters, pollsVoters) { + return pollsVoters.length < voters; }, - @computed("pollsVoters", "numOfVotersToShow") - showMore(pollsVoters, numOfVotersToShow) { - return !(Object.keys(pollsVoters).length < numOfVotersToShow); + @computed("poll.options", "offset") + voterIds(options) { + const ids = [].concat(...(options.map(option => option.voter_ids))); + return this._getIds(ids); } }); diff --git a/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 b/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 index 5718642b327..bbaf1813bc1 100644 --- a/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 +++ b/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 @@ -2,8 +2,6 @@ import round from "discourse/lib/round"; import computed from 'ember-addons/ember-computed-decorators'; export default Em.Component.extend({ - tagName: "span", - @computed("poll.options.@each.{html,votes}") totalScore() { return _.reduce(this.get("poll.options"), function(total, o) { diff --git a/plugins/poll/assets/javascripts/components/poll-results-standard-voters.js.es6 b/plugins/poll/assets/javascripts/components/poll-results-standard-voters.js.es6 index 1e51dc23c44..80dc1ef8b3f 100644 --- a/plugins/poll/assets/javascripts/components/poll-results-standard-voters.js.es6 +++ b/plugins/poll/assets/javascripts/components/poll-results-standard-voters.js.es6 @@ -3,23 +3,13 @@ import User from 'discourse/models/user'; import PollVoters from 'discourse/plugins/poll/components/poll-voters'; export default PollVoters.extend({ - @computed("pollsVoters", "option.voter_ids", "showMore", "isExpanded", "numOfVotersToShow") - users(pollsVoters, voterIds, showMore, isExpanded, numOfVotersToShow) { - var users = []; - - if (showMore && !isExpanded) { - voterIds = voterIds.slice(0, numOfVotersToShow); - } - - voterIds.forEach(voterId => { - users.push(pollsVoters[voterId]); - }); - - return users; + @computed("option.votes", "pollsVoters") + canLoadMore(voters, pollsVoters) { + return pollsVoters.length < voters; }, - @computed("option.votes", "numOfVotersToShow") - showMore(numOfVotes, numOfVotersToShow) { - return !(numOfVotes < numOfVotersToShow); + @computed("option.voter_ids", "offset") + voterIds(ids) { + return this._getIds(ids); } }); diff --git a/plugins/poll/assets/javascripts/components/poll-voters.js.es6 b/plugins/poll/assets/javascripts/components/poll-voters.js.es6 index b580f111821..d2b8af9ae9f 100644 --- a/plugins/poll/assets/javascripts/components/poll-voters.js.es6 +++ b/plugins/poll/assets/javascripts/components/poll-voters.js.es6 @@ -3,11 +3,51 @@ export default Ember.Component.extend({ tagName: 'ul', classNames: ["poll-voters-list"], isExpanded: false, - numOfVotersToShow: 20, + numOfVotersToShow: 0, + offset: 0, + loading: false, + pollsVoters: null, + + init() { + this._super(); + this.set("pollsVoters", []); + }, + + _fetchUsers() { + this.set("loading", true); + + Discourse.ajax("/polls/voters.json", { + type: "get", + data: { user_ids: this.get("voterIds") } + }).then(result => { + if (this.isDestroyed) return; + this.set("pollsVoters", this.get("pollsVoters").concat(result.users)); + this.incrementProperty("offset"); + this.set("loading", false); + }).catch((error) => { + Ember.logger.log(error); + bootbox.alert(I18n.t('poll.error_while_fetching_voters')); + }); + }, + + _getIds(ids) { + const numOfVotersToShow = this.get("numOfVotersToShow"); + const offset = this.get("offset"); + return ids.slice(numOfVotersToShow * offset, numOfVotersToShow * (offset + 1)); + }, + + didInsertElement() { + this._super(); + + Ember.run.schedule("afterRender", () => { + this.set("numOfVotersToShow", Math.round(this.$().width() / 25) * 2); + if (this.get("voterIds").length > 0) this._fetchUsers(); + }); + }, actions: { - toggleExpand() { - this.toggleProperty("isExpanded"); + loadMore() { + this._fetchUsers(); } } }); diff --git a/plugins/poll/assets/javascripts/controllers/poll.js.es6 b/plugins/poll/assets/javascripts/controllers/poll.js.es6 index 50b80eb6d8c..841a3beb8ab 100644 --- a/plugins/poll/assets/javascripts/controllers/poll.js.es6 +++ b/plugins/poll/assets/javascripts/controllers/poll.js.es6 @@ -6,7 +6,6 @@ export default Ember.Controller.extend({ isRandom : Ember.computed.equal("poll.order", "random"), isClosed: Ember.computed.equal("poll.status", "closed"), isPublic: Ember.computed.equal("poll.public", "true"), - pollsVoters: Ember.computed.alias("post.polls_voters"), // shows the results when // - poll is closed @@ -152,10 +151,6 @@ export default Ember.Controller.extend({ this.setProperties({ vote: votes, showResults: true }); this.set("model", Em.Object.create(poll)); - - if (poll.public) { - this.get("pollsVoters")[currentUser.get("id")] = currentUser; - } }).catch(() => { bootbox.alert(I18n.t("poll.error_while_casting_votes")); }).finally(() => { diff --git a/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-number.hbs b/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-number.hbs index 48e73ff2fc8..c00255a0988 100644 --- a/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-number.hbs +++ b/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-number.hbs @@ -1,5 +1,7 @@ -{{{averageRating}}} +
+ {{{averageRating}}} +
{{#if poll.public}} - {{poll-results-number-voters poll=poll pollsVoters=pollsVoters}} + {{poll-results-number-voters poll=poll}} {{/if}} diff --git a/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-standard.hbs b/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-standard.hbs index e412d61a772..5f939cbc87c 100644 --- a/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-standard.hbs +++ b/plugins/poll/assets/javascripts/discourse/templates/components/poll-results-standard.hbs @@ -11,7 +11,7 @@ {{#if poll.public}} - {{poll-results-standard-voters option=option pollsVoters=pollsVoters}} + {{poll-results-standard-voters option=option}} {{/if}} {{/each}} diff --git a/plugins/poll/assets/javascripts/discourse/templates/components/poll-voters.hbs b/plugins/poll/assets/javascripts/discourse/templates/components/poll-voters.hbs index 5c5a57aa594..53f6fcdc7b5 100644 --- a/plugins/poll/assets/javascripts/discourse/templates/components/poll-voters.hbs +++ b/plugins/poll/assets/javascripts/discourse/templates/components/poll-voters.hbs @@ -1,5 +1,5 @@ diff --git a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs index d459a0c6845..af63c2a4b15 100644 --- a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs +++ b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs @@ -2,9 +2,9 @@
{{#if showingResults}} {{#if isNumber}} - {{poll-results-number poll=poll pollsVoters=pollsVoters}} + {{poll-results-number poll=poll}} {{else}} - {{poll-results-standard poll=poll pollsVoters=pollsVoters}} + {{poll-results-standard poll=poll}} {{/if}} {{else}}
    diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 index 0b7919258bf..d0993720922 100644 --- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 +++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 @@ -29,10 +29,6 @@ function initializePolls(api) { const post = this.get('model.postStream').findLoadedPost(msg.post_id); if (post) { post.set('polls', msg.polls); - - if (msg.user) { - post.set(`polls_voters.${msg.user.id}`, msg.user); - } } }); }, @@ -80,7 +76,6 @@ function initializePolls(api) { const post = helper.getModel(); api.preventCloak(post.id); const votes = post.get('polls_votes') || {}; - post.set("polls_voters", (post.get("polls_voters") || {})); post.pollsChanged(); diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss index 5db25555550..1d25e2d5743 100644 --- a/plugins/poll/assets/stylesheets/common/poll.scss +++ b/plugins/poll/assets/stylesheets/common/poll.scss @@ -81,7 +81,7 @@ div.poll { vertical-align: middle; padding: 10px; - & > span { + .poll-results-number-rating { font-size: 2em; } } @@ -97,10 +97,11 @@ div.poll { display: inline; } - margin: 5px 0; + margin-top: 10px; } .poll-voters-toggle-expand { + width: 100%; text-align: center; } diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml index 9cad3df38dc..4344b85bd13 100644 --- a/plugins/poll/config/locales/client.en.yml +++ b/plugins/poll/config/locales/client.en.yml @@ -67,3 +67,4 @@ en: error_while_toggling_status: "There was an error while toggling the status of this poll." error_while_casting_votes: "There was an error while casting your votes." + error_while_fetching_voters: "There was an error while displaying the voters." diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb index 26b825dac6e..075be098317 100644 --- a/plugins/poll/plugin.rb +++ b/plugins/poll/plugin.rb @@ -185,7 +185,7 @@ after_initialize do class DiscoursePoll::PollsController < ::ApplicationController requires_plugin PLUGIN_NAME - before_filter :ensure_logged_in + before_filter :ensure_logged_in, except: [:voters] def vote post_id = params.require(:post_id) @@ -214,11 +214,22 @@ after_initialize do render_json_error e.message end end + + def voters + user_ids = params.require(:user_ids) + + users = User.where(id: user_ids).map do |user| + UserNameSerializer.new(user).serializable_hash + end + + render json: { users: users } + end end DiscoursePoll::Engine.routes.draw do put "/vote" => "polls#vote" put "/toggle_status" => "polls#toggle_status" + get "/voters" => 'polls#voters' end Discourse::Application.routes.append do @@ -299,26 +310,4 @@ after_initialize do return unless post_custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD].present? post_custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD].has_key?("#{scope.user.id}") end - - add_to_serializer(:post, :polls_voters) do - voters = {} - - user_ids = post_custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD].keys - - User.where(id: user_ids).map do |user| - voters[user.id] = UserNameSerializer.new(user).serializable_hash - end - - voters - end - - add_to_serializer(:post, :include_polls_voters?) do - return unless post_custom_fields.present? - return unless post_custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD].present? - return unless post_custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD].present? - - post_custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD].any? do |_, value| - value["public"] == "true" - end - end end diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb index 8dc6a66cfa6..9e8e0196443 100644 --- a/plugins/poll/spec/controllers/polls_controller_spec.rb +++ b/plugins/poll/spec/controllers/polls_controller_spec.rb @@ -173,5 +173,4 @@ describe ::DiscoursePoll::PollsController do end end - end diff --git a/plugins/poll/spec/integration/poll_endpoints_spec.rb b/plugins/poll/spec/integration/poll_endpoints_spec.rb new file mode 100644 index 00000000000..6aeb65cd300 --- /dev/null +++ b/plugins/poll/spec/integration/poll_endpoints_spec.rb @@ -0,0 +1,18 @@ +require "rails_helper" + +describe "DiscoursePoll endpoints" do + describe "fetch voters from user_ids" do + let(:user) { Fabricate(:user) } + + it "should return the right response" do + get "/polls/voters.json", { user_ids: [user.id] } + + expect(response.status).to eq(200) + + json = JSON.parse(response.body)["users"].first + + expect(json["name"]).to eq(user.name) + expect(json["title"]).to eq(user.title) + end + end +end From 3de2d7a0037e5a8bcedb7f964d043eed81489ce7 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Sun, 12 Jun 2016 03:02:07 -0700 Subject: [PATCH 285/320] better invite copy --- config/locales/server.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index a0a5c6bd4cd..6438a804ae0 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1583,7 +1583,7 @@ en: %{invite_link} - This invitation is from a trusted user, so you won't need to log in. + This invitation is from a trusted user, so an account will be created for you automatically. custom_invite_forum_mailer: subject_template: "%{invitee_name} invited you to join %{site_domain_name}" @@ -1602,7 +1602,7 @@ en: %{invite_link} - This invitation is from a trusted user, so you won't need to log in. + This invitation is from a trusted user, so an account will be created for you automatically. invite_password_instructions: subject_template: "Set password for your %{site_name} account" From 3a8d366011d070289528249c48b93377fc43a749 Mon Sep 17 00:00:00 2001 From: awesomerobot Date: Sun, 12 Jun 2016 19:46:24 -0400 Subject: [PATCH 286/320] usercard background matches theme background (default = white) --- app/assets/stylesheets/desktop/user-card.scss | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss index 2980ef2cf18..687534cdf72 100644 --- a/app/assets/stylesheets/desktop/user-card.scss +++ b/app/assets/stylesheets/desktop/user-card.scss @@ -1,8 +1,8 @@ // styles that apply to the "share" popup when sharing a link to a post or topic // Colors should mostly be absolute here, it will look the same in dark & light themes -$user_card_primary: #fff; -$user_card_background: #222; +$user_card_primary: $primary; +$user_card_background: $secondary; #user-card { position: absolute; @@ -10,7 +10,7 @@ $user_card_background: #222; left: -9999px; top: -9999px; z-index: 990; - box-shadow: 0 2px 12px rgba($primary, .6); + box-shadow: 1px 2px 6px rgba(0,0,0, .25); margin-top: -2px; color: $user_card_primary; background: $user_card_background center center; @@ -94,7 +94,7 @@ $user_card_background: #222; font-size: 0.929em; font-weight: normal; margin-top: 0; - color: scale-color($user_card_primary, $lightness: 25%); + color: scale-color($user_card_primary, $lightness: 20%); overflow: hidden; text-overflow: ellipsis; a { @@ -121,7 +121,7 @@ $user_card_background: #222; display: inline; margin-right: 5px; .desc, a { - color: scale-color($user_card_primary, $lightness: 50%); + color: scale-color($user_card_primary, $lightness: 35%); } } div {display: inline; color: scale-color($user_card_background, $lightness: 50%); @@ -139,7 +139,7 @@ $user_card_background: #222; } .bio { - padding: 15px 0 0 0; + padding: 10px 0 0 0; clear: left; a { @@ -161,9 +161,11 @@ $user_card_background: #222; .location-and-website { clear: left; - + margin-top: 5px; + .location {margin-right: 10px;} .website-name { a { + text-decoration: underline; color: $user_card_primary; } } @@ -204,7 +206,6 @@ $user_card_background: #222; height: 60px; position: relative; width: 45%; - margin-top: 11px; span { position: absolute; @@ -222,9 +223,9 @@ $user_card_background: #222; margin-top: 5px; .user-badge { - background: transparent; - color: scale-color($user_card_background, $lightness: 50%); - border-color: scale-color($user_card_background, $lightness: 50%); + background: scale-color($user_card_background, $lightness: -5%); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + color: $user_card_primary; } h3 { From 142b74b01b0bbab29bad1334992762695d632307 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 13 Jun 2016 09:34:52 +0800 Subject: [PATCH 287/320] Add default queues to sidekiq.yml. --- config/sidekiq.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 config/sidekiq.yml diff --git a/config/sidekiq.yml b/config/sidekiq.yml new file mode 100644 index 00000000000..7b095d7d42a --- /dev/null +++ b/config/sidekiq.yml @@ -0,0 +1,6 @@ +--- +development: + :queues: + - [critical,4] + - [default, 2] + - [low] From 0c8dd283953187196280b68fda275bbf281aa6e8 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 13 Jun 2016 11:25:06 +0800 Subject: [PATCH 288/320] FIX: Post count wasn't recovered when a post is recovered. --- lib/post_destroyer.rb | 6 ++++++ spec/components/post_destroyer_spec.rb | 28 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb index 9d35572f0f9..b1538585af6 100644 --- a/lib/post_destroyer.rb +++ b/lib/post_destroyer.rb @@ -64,6 +64,12 @@ class PostDestroyer def staff_recovered @post.recover! + + if author = @post.user + author.user_stat.post_count += 1 + author.user_stat.save! + end + @post.publish_change_to_clients! :recovered TopicTrackingState.publish_recover(@post.topic) if @post.topic && @post.post_number == 1 end diff --git a/spec/components/post_destroyer_spec.rb b/spec/components/post_destroyer_spec.rb index 00573a5f4de..aacad3ca961 100644 --- a/spec/components/post_destroyer_spec.rb +++ b/spec/components/post_destroyer_spec.rb @@ -162,6 +162,34 @@ describe PostDestroyer do post_action = author.user_actions.where(action_type: UserAction::REPLY, target_post_id: reply.id).first expect(post_action).to be_present end + + describe "post_count recovery" do + before do + post + @user = post.user + expect(@user.user_stat.post_count).to eq(1) + end + + context "recovered by user" do + it "should increment the user's post count" do + PostDestroyer.new(@user, post).destroy + expect(@user.user_stat.post_count).to eq(1) + + PostDestroyer.new(@user, post.reload).recover + expect(@user.reload.user_stat.post_count).to eq(1) + end + end + + context "recovered by admin" do + it "should increment the user's post count" do + PostDestroyer.new(moderator, post).destroy + expect(@user.user_stat.post_count).to eq(0) + + PostDestroyer.new(admin, post).recover + expect(@user.reload.user_stat.post_count).to eq(1) + end + end + end end describe 'basic destroying' do From 8c3e63f87af941fb2d8b1097d1e9ce2c99320d16 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 13 Jun 2016 12:24:38 +0800 Subject: [PATCH 289/320] Raise an error if create fails. --- app/models/topic_link.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index 08114bfaecf..b35ec1c762d 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -159,7 +159,7 @@ class TopicLink < ActiveRecord::Base next if parsed && parsed.host && parsed.host.length > TopicLink.max_domain_length added_urls << url - TopicLink.create(post_id: post.id, + TopicLink.create!(post_id: post.id, user_id: post.user_id, topic_id: post.topic_id, url: url, @@ -184,7 +184,7 @@ class TopicLink < ActiveRecord::Base url: reflected_url) unless tl - tl = TopicLink.create(user_id: post.user_id, + tl = TopicLink.create!(user_id: post.user_id, topic_id: topic_id, post_id: reflected_post.try(:id), url: reflected_url, From 1fe499e893eceb07294b0adf6edd97c8c41798a6 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 13 Jun 2016 13:13:39 +0800 Subject: [PATCH 290/320] FIX: Don't include reflections when checking for duplication topic links. --- app/models/topic_link.rb | 3 ++- spec/models/topic_link_spec.rb | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index b35ec1c762d..4ba19ef7bca 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -233,7 +233,8 @@ class TopicLink < ActiveRecord::Base results = TopicLink .includes(:post => :user) - .where(topic_id: topic.id).limit(200) + .where(topic_id: topic.id, reflection: false) + .limit(200) lookup = {} results.each do |tl| diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb index 487c6852f30..5fb86c7fc54 100644 --- a/spec/models/topic_link_spec.rb +++ b/spec/models/topic_link_spec.rb @@ -16,6 +16,8 @@ describe TopicLink do topic.user end + let(:post) { Fabricate(:post) } + it "can't link to the same topic" do ftl = TopicLink.new(url: "/t/#{topic.id}", topic_id: topic.id, @@ -320,6 +322,31 @@ http://b.com/#{'a'*500} end end + + describe ".duplicate_lookup" do + let(:user) { Fabricate(:user, username: "junkrat") } + + let(:post_with_internal_link) do + Fabricate(:post, user: user, raw: "Check out this topic #{post.topic.url}/122131") + end + + it "should return the right response" do + TopicLink.extract_from(post_with_internal_link) + + result = TopicLink.duplicate_lookup(post_with_internal_link.topic) + expect(result.count).to eq(1) + + lookup = result["test.localhost/t/#{post.topic.slug}/#{post.topic.id}/122131"] + + expect(lookup[:domain]).to eq("test.localhost") + expect(lookup[:username]).to eq("junkrat") + expect(lookup[:posted_at].to_s).to eq(post_with_internal_link.created_at.to_s) + expect(lookup[:post_number]).to eq(1) + + result = TopicLink.duplicate_lookup(post.topic) + expect(result.count).to eq(0) + end + end end end From 95efdce74f23707160af293256430d18148edf01 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 13 Jun 2016 13:16:24 +0800 Subject: [PATCH 291/320] Improve spec. --- spec/models/topic_link_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb index 5fb86c7fc54..5aca2837b17 100644 --- a/spec/models/topic_link_spec.rb +++ b/spec/models/topic_link_spec.rb @@ -344,7 +344,7 @@ http://b.com/#{'a'*500} expect(lookup[:post_number]).to eq(1) result = TopicLink.duplicate_lookup(post.topic) - expect(result.count).to eq(0) + expect(result).to eq({}) end end end From 191d2283f46f34f85a6286b1a669ec8071648ae7 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 13 Jun 2016 14:31:10 +0800 Subject: [PATCH 292/320] Fix specs. --- app/models/topic_link.rb | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index 4ba19ef7bca..505565caf53 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -133,7 +133,7 @@ class TopicLink < ActiveRecord::Base # We aren't interested in tracking internal links to users next if route[:controller] == 'users' - topic_id = route[:topic_id] + topic_id = route[:topic_id].to_i post_number = route[:post_number] || 1 # Store the canonical URL @@ -159,15 +159,22 @@ class TopicLink < ActiveRecord::Base next if parsed && parsed.host && parsed.host.length > TopicLink.max_domain_length added_urls << url - TopicLink.create!(post_id: post.id, - user_id: post.user_id, - topic_id: post.topic_id, - url: url, - domain: parsed.host || Discourse.current_hostname, - internal: internal, - link_topic_id: topic_id, - link_post_id: reflected_post.try(:id), - quote: link.is_quote) + + topic_link = TopicLink.find_by(topic_id: post.topic_id, + user_id: post.user_id, + url: url) + + unless topic_link + TopicLink.create!(post_id: post.id, + user_id: post.user_id, + topic_id: post.topic_id, + url: url, + domain: parsed.host || Discourse.current_hostname, + internal: internal, + link_topic_id: topic_id, + link_post_id: reflected_post.try(:id), + quote: link.is_quote) + end # Create the reflection if we can if topic_id.present? From c13cbc8aeadcd849b7342636ffac5dff93111e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 13 Jun 2016 11:11:25 +0200 Subject: [PATCH 293/320] FIX: only show topic links from active users --- app/models/topic_link.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index 505565caf53..27735689d85 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -237,17 +237,18 @@ class TopicLink < ActiveRecord::Base end def self.duplicate_lookup(topic) - results = TopicLink - .includes(:post => :user) + .includes(:post, :user) + .joins(:post, :user) + .where("posts.id IS NOT NULL AND users.id IS NOT NULL") .where(topic_id: topic.id, reflection: false) - .limit(200) + .last(200) lookup = {} results.each do |tl| normalized = tl.url.downcase.sub(/^https?:\/\//, '').sub(/\/$/, '') lookup[normalized] = { domain: tl.domain, - username: tl.post.user.username_lower, + username: tl.user.username_lower, posted_at: tl.post.created_at, post_number: tl.post.post_number } end From 49f8a2baa78789c098eef9ef980570deb6cf5a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 13 Jun 2016 12:31:01 +0200 Subject: [PATCH 294/320] FEATURE: support for mandrill webhooks --- app/controllers/webhooks_controller.rb | 17 ++++++++++++++ config/routes.rb | 1 + lib/email/sender.rb | 7 ++++-- spec/controllers/webhooks_controller_spec.rb | 24 ++++++++++++++++++++ 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb index 79265ee2aea..90edfe99a77 100644 --- a/app/controllers/webhooks_controller.rb +++ b/app/controllers/webhooks_controller.rb @@ -71,6 +71,23 @@ class WebhooksController < ActionController::Base render nothing: true, status: 200 end + def mandrill + events = params["mandrill_events"] + events.each do |event| + message_id = event["msg"]["metadata"]["message_id"] rescue nil + next unless message_id + + case event["event"] + when "hard_bounce" + process_bounce(message_id, Email::Receiver::HARD_BOUNCE_SCORE) + when "soft_bounce" + process_bounce(message_id, Email::Receiver::SOFT_BOUNCE_SCORE) + end + end + + render nothing: true, status: 200 + end + private def mailgun_failure diff --git a/config/routes.rb b/config/routes.rb index 717fe6da517..92497616fc6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,6 +19,7 @@ Discourse::Application.routes.draw do post "webhooks/mailgun" => "webhooks#mailgun" post "webhooks/sendgrid" => "webhooks#sendgrid" post "webhooks/mailjet" => "webhooks#mailjet" + post "webhooks/mandrill" => "webhooks#mandrill" if Rails.env.development? mount Sidekiq::Web => "/sidekiq" diff --git a/lib/email/sender.rb b/lib/email/sender.rb index e40cf09a675..d3774641820 100644 --- a/lib/email/sender.rb +++ b/lib/email/sender.rb @@ -133,9 +133,12 @@ module Email @message.header['X-Discourse-Post-Id'] = nil if post_id.present? @message.header['X-Discourse-Reply-Key'] = nil if reply_key.present? - # it's the only way to pass the original message_id when using mailjet - if ActionMailer::Base.smtp_settings[:address][".mailjet.com"] + # pass the original message_id when using mailjet/mandrill + case ActionMailer::Base.smtp_settings[:address] + when /\.mailjet\.com/ @message.header['X-MJ-CustomID'] = @message.message_id + when "smtp.mandrillapp.com" + @message.header['X-MC-Metadata'] = { message_id: @message.message_id }.to_json end # Suppress images from short emails diff --git a/spec/controllers/webhooks_controller_spec.rb b/spec/controllers/webhooks_controller_spec.rb index 0bf1b361144..6e599a2aaf4 100644 --- a/spec/controllers/webhooks_controller_spec.rb +++ b/spec/controllers/webhooks_controller_spec.rb @@ -75,4 +75,28 @@ describe WebhooksController do end + context "mandrill" do + + it "works" do + user = Fabricate(:user, email: email) + email_log = Fabricate(:email_log, user: user, message_id: message_id) + + post :mandrill, mandrill_events: [{ + "event" => "hard_bounce", + "msg" => { + "metadata" => { + "message_id" => message_id + } + } + }] + + expect(response).to be_success + + email_log.reload + expect(email_log.bounced).to eq(true) + expect(email_log.user.user_stat.bounce_score).to eq(2) + end + + end + end From e97e0bb311d1bea13512c1b77a7c1ca9e8018cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 13 Jun 2016 15:37:14 +0200 Subject: [PATCH 295/320] FEATURE: new FirstReplyByEmail bronze badge --- .../onceoff/grand_first_reply_by_email.rb | 31 +++++++++++++++++++ app/jobs/onceoff/grant_emoji.rb | 8 +++-- app/jobs/onceoff/grant_onebox.rb | 5 ++- app/models/badge.rb | 5 +-- config/locales/server.en.yml | 5 +++ db/fixtures/006_badges.rb | 14 +++++++++ 6 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 app/jobs/onceoff/grand_first_reply_by_email.rb diff --git a/app/jobs/onceoff/grand_first_reply_by_email.rb b/app/jobs/onceoff/grand_first_reply_by_email.rb new file mode 100644 index 00000000000..12fbb86e567 --- /dev/null +++ b/app/jobs/onceoff/grand_first_reply_by_email.rb @@ -0,0 +1,31 @@ +module Jobs + + class GrantFirstReplyByEmail < Jobs::Onceoff + def execute_onceoff(args) + to_award = {} + + Post.select(:id, :created_at, :user_id) + .secured(Guardian.new) + .visible + .public_posts + .where(via_email: true) + .where("post_number > 1") + .find_in_batches do |group| + group.each do |p| + to_award[p.user_id] ||= { post_id: p.id, created_at: p.created_at } + end + end + + to_award.each do |user_id, opts| + user = User.where(id: user_id).first + BadgeGranter.grant(badge, user, opts) if user + end + end + + def badge + @badge ||= Badge.find(Badge::FirstReplyByEmail) + end + + end + +end diff --git a/app/jobs/onceoff/grant_emoji.rb b/app/jobs/onceoff/grant_emoji.rb index 9a57423d6c0..3b9608ec578 100644 --- a/app/jobs/onceoff/grant_emoji.rb +++ b/app/jobs/onceoff/grant_emoji.rb @@ -18,12 +18,16 @@ module Jobs end end - badge = Badge.find(Badge::FirstEmoji) to_award.each do |user_id, opts| - BadgeGranter.grant(badge, User.find(user_id), opts) + user = User.where(id: user_id).first + BadgeGranter.grant(badge, user, opts) if user end end + def badge + @badge ||= Badge.find(Badge::FirstEmoji) + end + end end diff --git a/app/jobs/onceoff/grant_onebox.rb b/app/jobs/onceoff/grant_onebox.rb index 113f2e542c6..3dadbd16d3c 100644 --- a/app/jobs/onceoff/grant_onebox.rb +++ b/app/jobs/onceoff/grant_onebox.rb @@ -28,13 +28,16 @@ module Jobs end - badge = Badge.find(Badge::FirstOnebox) to_award.each do |user_id, opts| user = User.where(id: user_id).first BadgeGranter.grant(badge, user, opts) if user end end + def badge + @badge ||= Badge.find(Badge::FirstOnebox) + end + end end diff --git a/app/models/badge.rb b/app/models/badge.rb index 55e1d81f3f1..4a2105a1091 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -1,6 +1,6 @@ class Badge < ActiveRecord::Base - # NOTE: These badge ids are not in order! They are grouped logically. When picking an id - # search for it. + # NOTE: These badge ids are not in order! They are grouped logically. + # When picking an id, *search* for it. Welcome = 5 NicePost = 6 @@ -17,6 +17,7 @@ class Badge < ActiveRecord::Base FirstMention = 40 FirstEmoji = 41 FirstOnebox = 42 + FirstReplyByEmail = 43 ReadGuidelines = 16 Reader = 17 diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 6438a804ae0..7f2a04b795c 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -3095,6 +3095,11 @@ en: name: First Onebox description: Posted a link that was oneboxed long_description: This badge is granted the first time you post a link on a line by itself, which was then automatically expanded into a onebox with a brief summary of the link, a title, and (when available) a picture. + first_reply_by_email: + name: First Reply By Email + description: Replied to a Post via email + long_description: | + This badge is granted the first time you reply to a post via email :e-mail:. admin_login: success: "Email Sent" diff --git a/db/fixtures/006_badges.rb b/db/fixtures/006_badges.rb index b9fc82f80af..bf99aa53a43 100644 --- a/db/fixtures/006_badges.rb +++ b/db/fixtures/006_badges.rb @@ -400,6 +400,20 @@ Badge.seed do |b| b.system = true end +Badge.seed do |b| + b.id = Badge::FirstReplyByEmail + b.default_name = "First Reply By Email" + b.badge_type_id = BadgeType::Bronze + b.multiple_grant = false + b.target_posts = true + b.show_posts = true + b.query = nil + b.badge_grouping_id = BadgeGrouping::GettingStarted + b.default_badge_grouping_id = BadgeGrouping::GettingStarted + b.trigger = Badge::Trigger::PostProcessed + b.system = true +end + Badge.where("NOT system AND id < 100").each do |badge| new_id = [Badge.maximum(:id) + 1, 100].max old_id = badge.id From d2bd857160b27877aba237a16751b409b6efc4ef Mon Sep 17 00:00:00 2001 From: Rimian Perkins Date: Tue, 14 Jun 2016 12:06:11 +1000 Subject: [PATCH 296/320] enable args MODULE and FILTER for qunit:test rake task --- lib/tasks/qunit.rake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake index 061ae69ffb6..07e9a48b6ed 100644 --- a/lib/tasks/qunit.rake +++ b/lib/tasks/qunit.rake @@ -37,6 +37,16 @@ task "qunit:test" => :environment do test_path = "#{Rails.root}/vendor/assets/javascripts" cmd = "phantomjs #{test_path}/run-qunit.js http://localhost:#{port}/qunit" + options = {} + + %w{module filter}.each do |arg| + options[arg] = ENV[arg.upcase] if ENV[arg.upcase].present? + end + + if options.present? + cmd += "?#{options.to_query.gsub('+', '%20')}" + end + # wait for server to respond, will exception out on failure tries = 0 begin From 470da6205c36d83daa32c8403d0d0bf886e5f0ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 14 Jun 2016 16:45:47 +0200 Subject: [PATCH 297/320] FIX: staged users should not watch/track/mute categories by default --- app/models/user.rb | 2 ++ app/models/user_option.rb | 1 - spec/models/user_spec.rb | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index bff29252386..c44a6fd3a5d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -952,6 +952,8 @@ class User < ActiveRecord::Base end def set_default_categories_preferences + return if self.staged? + values = [] %w{watching tracking muted}.each do |s| diff --git a/app/models/user_option.rb b/app/models/user_option.rb index 6f0a8ecbdc6..7a812e4033f 100644 --- a/app/models/user_option.rb +++ b/app/models/user_option.rb @@ -42,7 +42,6 @@ class UserOption < ActiveRecord::Base self.like_notification_frequency = SiteSetting.default_other_like_notification_frequency - if SiteSetting.default_email_digest_frequency.to_i <= 0 self.email_digests = false else diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 4fbd120a68a..e08759b6d97 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1235,6 +1235,13 @@ describe User do expect(CategoryUser.lookup(user, :tracking).pluck(:category_id)).to eq([2]) expect(CategoryUser.lookup(user, :muted).pluck(:category_id)).to eq([3]) end + + it "does not set category preferences for staged users" do + user = Fabricate(:user, staged: true) + expect(CategoryUser.lookup(user, :watching).pluck(:category_id)).to eq([]) + expect(CategoryUser.lookup(user, :tracking).pluck(:category_id)).to eq([]) + expect(CategoryUser.lookup(user, :muted).pluck(:category_id)).to eq([]) + end end context UserOption do From b42f28d4c36eddce1df039566f3615b0753a2dc6 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 14 Jun 2016 11:44:35 -0400 Subject: [PATCH 298/320] Improved mailing list import. Now uses a SQLite database to store messages rather than JSON files for performance and memory considerations. --- script/import_scripts/base.rb | 12 +- script/import_scripts/mbox.rb | 257 ++++++++++++++++++++++++---------- 2 files changed, 188 insertions(+), 81 deletions(-) diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb index f4b378b4f3c..e7829a27013 100644 --- a/script/import_scripts/base.rb +++ b/script/import_scripts/base.rb @@ -198,10 +198,14 @@ class ImportScripts::Base def all_records_exist?(type, import_ids) return false if import_ids.empty? - Post.exec_sql('CREATE TEMP TABLE import_ids(val varchar(200) PRIMARY KEY)') + orig_conn = ActiveRecord::Base.connection + conn = orig_conn.raw_connection + + conn.exec('CREATE TEMP TABLE import_ids(val varchar(200) PRIMARY KEY)') import_id_clause = import_ids.map { |id| "('#{PG::Connection.escape_string(id.to_s)}')" }.join(",") - Post.exec_sql("INSERT INTO import_ids VALUES #{import_id_clause}") + + conn.exec("INSERT INTO import_ids VALUES #{import_id_clause}") existing = "#{type.to_s.classify}CustomField".constantize.where(name: 'import_id') existing = existing.joins('JOIN import_ids ON val = value') @@ -211,7 +215,7 @@ class ImportScripts::Base return true end ensure - Post.exec_sql('DROP TABLE import_ids') + conn.exec('DROP TABLE import_ids') end # Iterate through a list of user records to be imported. @@ -366,7 +370,7 @@ class ImportScripts::Base params[:parent_category_id] = top.id if top end - new_category = create_category(params, params[:id]) + create_category(params, params[:id]) created += 1 end diff --git a/script/import_scripts/mbox.rb b/script/import_scripts/mbox.rb index cf50d1aed91..978b30cc236 100755 --- a/script/import_scripts/mbox.rb +++ b/script/import_scripts/mbox.rb @@ -1,3 +1,4 @@ +require 'sqlite3' require File.expand_path(File.dirname(__FILE__) + "/base.rb") class ImportScripts::Mbox < ImportScripts::Base @@ -5,96 +6,169 @@ class ImportScripts::Mbox < ImportScripts::Base BATCH_SIZE = 1000 CATEGORY_ID = 6 - MBOX_DIR = "/tmp/mbox-input" - USER_INDEX_PATH = "#{MBOX_DIR}/user-index.json" - TOPIC_INDEX_PATH = "#{MBOX_DIR}/topic-index.json" - REPLY_INDEX_PATH = "#{MBOX_DIR}/replies-index.json" + MBOX_DIR = File.expand_path("~/import/site") + + # Remove to not split individual files + SPLIT_AT = /^From owner-/ def execute - create_indices + create_email_indices + create_user_indices + massage_indices import_users create_forum_topics import_replies end - def all_messages + def open_db + SQLite3::Database.new("#{MBOX_DIR}/index.db") + end - files = Dir["#{MBOX_DIR}/*/*"] + def all_messages + files = Dir["#{MBOX_DIR}/messages/*"] files.each_with_index do |f, idx| - raw = File.read(f) - mail = Mail.read_from_string(raw) - yield mail, f - print_status(idx, files.size) + if SPLIT_AT.present? + msg = "" + File.foreach(f).with_index do |line, line_num| + line = line.scrub + if line =~ SPLIT_AT + if !msg.empty? + mail = Mail.read_from_string(msg) + yield mail + print_status(idx, files.size) + msg = "" + end + end + msg << line + end + if !msg.empty? + mail = Mail.read_from_string(msg) + yield mail + print_status(idx, files.size) + msg = "" + end + else + raw = File.read(f) + mail = Mail.read_from_string(raw) + yield mail + print_status(idx, files.size) + end + end end - def create_indices - return if File.exist?(USER_INDEX_PATH) && File.exist?(TOPIC_INDEX_PATH) && File.exist?(REPLY_INDEX_PATH) - puts "", "creating indices" - users = {} + def massage_indices + db = open_db + db.execute "UPDATE emails SET reply_to = null WHERE reply_to = ''" - topics = [] + rows = db.execute "SELECT msg_id, title, reply_to FROM emails ORDER BY email_date ASC" - topic_lookup = {} - topic_titles = {} - replies = [] + msg_ids = {} + titles = {} + rows.each do |row| + msg_ids[row[0]] = true + titles[row[1]] = row[0] + end - all_messages do |mail, filename| - users[mail.from.first] = mail[:from].display_names.first - - msg_id = mail['Message-ID'].to_s - reply_to = mail['In-Reply-To'].to_s - title = clean_title(mail['Subject'].to_s) - date = Time.parse(mail['date'].to_s).to_i + # First, any replies where the parent doesn't exist should have that field cleared + not_found = [] + rows.each do |row| + msg_id, _, reply_to = row if reply_to.present? - topic = topic_lookup[reply_to] || reply_to - topic_lookup[msg_id] = topic - replies << {id: msg_id, topic: topic, file: filename, title: title, date: date} - else - topics << {id: msg_id, file: filename, title: title, date: date} - topic_titles[title] ||= msg_id + not_found << msg_id if msg_ids[reply_to].blank? end end - replies.sort! {|a, b| a[:date] <=> b[:date]} - topics.sort! {|a, b| a[:date] <=> b[:date]} - - # Replies without parents should be hoisted to topics - to_hoist = [] - replies.each do |r| - to_hoist << r if !topic_lookup[r[:topic]] + puts "#{not_found.size} records couldn't be associated with parents" + if not_found.present? + db.execute "UPDATE emails SET reply_to = NULL WHERE msg_id IN (#{not_found.map {|nf| "'#{nf}'"}.join(',')})" end - to_hoist.each do |h| - replies.delete(h) - topics << {id: h[:id], file: h[:file], title: h[:title], date: h[:date]} - topic_titles[h[:title]] ||= h[:id] + dupe_titles = db.execute "SELECT title, COUNT(*) FROM emails GROUP BY title HAVING count(*) > 1" + puts "#{dupe_titles.size} replies to wire up" + dupe_titles.each do |t| + title = t[0] + first = titles[title] + db.execute "UPDATE emails SET reply_to = ? WHERE title = ? and msg_id <> ?", [first, title, first] end - # Topics with duplicate replies should be replies - to_group = [] - topics.each do |t| - first = topic_titles[t[:title]] - to_group << t if first && first != t[:id] + ensure + db.close + end + + def create_email_indices + db = open_db + db.execute "DROP TABLE IF EXISTS emails" + db.execute <<-SQL + CREATE TABLE emails ( + msg_id VARCHAR(995) PRIMARY KEY, + from_email VARCHAR(255) NOT NULL, + from_name VARCHAR(255) NOT NULL, + title VARCHAR(255) NOT NULL, + reply_to VARCHAR(955) NULL, + email_date DATETIME NOT NULL, + message TEXT NOT NULL + ); + SQL + + db.execute "CREATE INDEX by_title ON emails (title)" + db.execute "CREATE INDEX by_email ON emails (from_email)" + + puts "", "creating indices" + + all_messages do |mail| + msg_id = mail['Message-ID'].to_s + + # Many ways to get a name + from = mail[:from] + from_name = nil + + from_email = nil + if mail.from.present? + from_email = mail.from.first + end + + display_names = from.try(:display_names) + if display_names.present? + from_name = display_names.first + end + + if from_name.blank? && from.to_s =~ /\(([^\)]+)\)/ + from_name = Regexp.last_match[1] + end + from_name = from.to_s if from_name.blank? + + title = clean_title(mail['Subject'].to_s) + reply_to = mail['In-Reply-To'].to_s + email_date = mail['date'].to_s + + db.execute "INSERT OR IGNORE INTO emails (msg_id, from_email, from_name, title, reply_to, email_date, message) + VALUES (?, ?, ?, ?, ?, ?, ?)", + [msg_id, from_email, from_name, title, reply_to, email_date, mail.to_s] end + ensure + db.close + end - to_group.each do |t| - topics.delete(t) - replies << {id: t[:id], topic: topic_titles[t[:title]], file: t[:file], title: t[:title], date: t[:date]} - end + def create_user_indices + db = open_db + db.execute "DROP TABLE IF EXISTS users" + db.execute <<-SQL + CREATE TABLE users ( + email VARCHAR(995) PRIMARY KEY, + name VARCHAR(255) NOT NULL + ); + SQL - replies.sort! {|a, b| a[:date] <=> b[:date]} - topics.sort! {|a, b| a[:date] <=> b[:date]} - - - File.write(USER_INDEX_PATH, {users: users}.to_json) - File.write(TOPIC_INDEX_PATH, {topics: topics}.to_json) - File.write(REPLY_INDEX_PATH, {replies: replies}.to_json) + db.execute "INSERT OR IGNORE INTO users (email, name) SELECT from_email, from_name FROM emails" + ensure + db.close end def clean_title(title) + title ||= "" #Strip mailing list name from subject title = title.gsub(/\[[^\]]+\]+/, '').strip @@ -125,24 +199,26 @@ class ImportScripts::Mbox < ImportScripts::Base def import_users puts "", "importing users" + db = open_db - all_users = ::JSON.parse(File.read(USER_INDEX_PATH))['users'] - user_keys = all_users.keys - total_count = user_keys.size + all_users = db.execute("SELECT name, email FROM users") + total_count = all_users.size batches(BATCH_SIZE) do |offset| - users = user_keys[offset..offset+BATCH_SIZE-1] + users = all_users[offset..offset+BATCH_SIZE-1] break if users.nil? - next if all_records_exist? :users, users + next if all_records_exist? :users, users.map {|u| u[1]} - create_users(users, total: total_count, offset: offset) do |email| + create_users(users, total: total_count, offset: offset) do |u| { - id: email, - email: email, - name: all_users[email] + id: u[1], + email: u[1], + name: u[0] } end end + ensure + db.close end def parse_email(msg) @@ -157,23 +233,33 @@ class ImportScripts::Mbox < ImportScripts::Base def create_forum_topics puts "", "creating forum topics" - all_topics = ::JSON.parse(File.read(TOPIC_INDEX_PATH))['topics'] + db = open_db + all_topics = db.execute("SELECT msg_id, + from_email, + from_name, + title, + email_date, + message + FROM emails + WHERE reply_to IS NULL") + topic_count = all_topics.size batches(BATCH_SIZE) do |offset| topics = all_topics[offset..offset+BATCH_SIZE-1] break if topics.nil? - next if all_records_exist? :posts, topics.map {|t| t['id']} + next if all_records_exist? :posts, topics.map {|t| t[0]} create_posts(topics, total: topic_count, offset: offset) do |t| - raw_email = File.read(t['file']) + raw_email = t[5] receiver = Email::Receiver.new(raw_email) mail = Mail.read_from_string(raw_email) mail.body selected = receiver.select_body next unless selected + selected = selected.join('') if selected.kind_of?(Array) raw = selected.force_encoding(selected.encoding).encode("UTF-8") @@ -195,7 +281,7 @@ class ImportScripts::Mbox < ImportScripts::Base end end - { id: t['id'], + { id: t[0], title: clean_title(title), user_id: user_id_from_imported_user_id(mail.from.first) || Discourse::SYSTEM_USER_ID, created_at: mail.date, @@ -204,34 +290,49 @@ class ImportScripts::Mbox < ImportScripts::Base cook_method: Post.cook_methods[:email] } end end + ensure + db.close end def import_replies puts "", "creating topic replies" - replies = ::JSON.parse(File.read(REPLY_INDEX_PATH))['replies'] + db = open_db + replies = db.execute("SELECT msg_id, + from_email, + from_name, + title, + email_date, + message, + reply_to + FROM emails + WHERE reply_to IS NOT NULL") + post_count = replies.size batches(BATCH_SIZE) do |offset| posts = replies[offset..offset+BATCH_SIZE-1] break if posts.nil? - next if all_records_exist? :posts, posts.map {|p| p['id']} + next if all_records_exist? :posts, posts.map {|p| p[0]} create_posts(posts, total: post_count, offset: offset) do |p| - parent_id = p['topic'] - id = p['id'] + parent_id = p[6] + id = p[0] topic = topic_lookup_from_imported_post_id(parent_id) topic_id = topic[:topic_id] if topic next unless topic_id - raw_email = File.read(p['file']) + raw_email = p[5] receiver = Email::Receiver.new(raw_email) mail = Mail.read_from_string(raw_email) mail.body selected = receiver.select_body + selected = selected.join('') if selected.kind_of?(Array) + next unless selected + raw = selected.force_encoding(selected.encoding).encode("UTF-8") # import the attachments @@ -258,6 +359,8 @@ class ImportScripts::Mbox < ImportScripts::Base cook_method: Post.cook_methods[:email] } end end + ensure + db.close end end From 3d3ce56f52b99eb2a8662d766390a577cb2fc7bb Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 14 Jun 2016 12:02:24 -0400 Subject: [PATCH 299/320] UX: Never show the back button if it's the last post --- app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 index a25207609b7..3dfdbb77437 100644 --- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 @@ -143,7 +143,7 @@ createWidget('timeline-scrollarea', { this.attach('timeline-padding', { height: after }) ]; - if (position.lastRead) { + if (position.lastRead && position.lastRead !== position.total) { const lastReadTop = Math.round(position.lastReadPercentage * SCROLLAREA_HEIGHT); if ((lastReadTop > (before + SCROLLER_HEIGHT)) && (lastReadTop < (SCROLLAREA_HEIGHT - SCROLLER_HEIGHT))) { result.push(this.attach('timeline-last-read', { top: lastReadTop, lastRead: position.lastRead })); From 5813352439b9b30708f347e7ba2b1c65d5037fda Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 14 Jun 2016 12:50:16 +0800 Subject: [PATCH 300/320] FEATURE: Add new API to add a toolbar popup menu button. --- .../discourse/controllers/composer.js.es6 | 39 +++++++++++++++++++ .../discourse/lib/plugin-api.js.es6 | 21 ++++++++++ .../discourse/templates/composer.hbs | 10 +++-- 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 5da1006830d..18784fa01e8 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -42,6 +42,12 @@ function loadDraft(store, opts) { } } +const _popupMenuOptionsCallbacks = []; + +export function addPopupMenuOptionsCallback(callback) { + _popupMenuOptionsCallbacks.push(callback); +} + export default Ember.Controller.extend({ needs: ['modal', 'topic', 'application'], replyAsNewTopicDraft: Em.computed.equal('model.draftKey', Composer.REPLY_AS_NEW_TOPIC_KEY), @@ -56,6 +62,20 @@ export default Ember.Controller.extend({ topic: null, linkLookup: null, + init() { + this._super(); + const self = this + + addPopupMenuOptionsCallback(function() { + return { + action: 'toggleWhisper', + icon: 'eye-slash', + label: 'composer.toggle_whisper', + condition: "canWhisper" + }; + }); + }, + showToolbar: Em.computed({ get(){ const keyValueStore = this.container.lookup('key-value-store:main'); @@ -92,6 +112,25 @@ export default Ember.Controller.extend({ return currentUser && currentUser.get('staff') && this.siteSettings.enable_whispers && action === Composer.REPLY; }, + @computed("model.composeState") + popupMenuOptions(composeState) { + const self = this; + + if (composeState === 'open') { + return _popupMenuOptionsCallbacks.map(callback => { + let option = callback(); + + if (option.condition) { + option.condition = self.get(option.condition); + } else { + option.condition = true; + } + + return option; + }); + } + }, + showWarning: function() { if (!Discourse.User.currentProp('staff')) { return false; } diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index b7e3eb040ec..8665e446899 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -10,6 +10,7 @@ import { onPageChange } from 'discourse/lib/page-tracker'; import { preventCloak } from 'discourse/widgets/post-stream'; import { h } from 'virtual-dom'; import { addFlagProperty } from 'discourse/components/site-header'; +import { addPopupMenuOptionsCallback } from 'discourse/controllers/composer'; class PluginApi { constructor(version, container) { @@ -224,6 +225,26 @@ class PluginApi { addToolbarCallback(callback); } + /** + * Add a new button in the options popup menu. + * + * Example: + * + * ``` + * api.addToolbarPopupMenuOptionsCallback(function(controller) { + * return { + * action: 'toggleWhisper', + * icon: 'eye-slash', + * label: 'composer.toggle_whisper', + * condition: "canWhisper" + * }; + * }); + * ``` + **/ + addToolbarPopupMenuOptionsCallback(callback) { + addPopupMenuOptionsCallback(callback); + } + /** * A hook that is called when the post stream is removed from the DOM. * This advanced hook should be used if you end up wiring up any diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index 9bf668db795..2e3c6636b97 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -3,9 +3,13 @@ {{#if currentUser.staff}} {{#popup-menu visible=optionsVisible hide="hideOptions" title="composer.options"}} -
  • - {{d-button action="toggleWhisper" icon="eye-slash" label="composer.toggle_whisper"}} -
    • + {{#each popupMenuOptions as |option|}} + {{#if option.condition}} +
  • + {{d-button action=option.action icon=option.icon label=option.label}} +
    • + {{/if}} + {{/each}} {{/popup-menu}} {{/if}} From 1dae7fbe0451ec96a8b42f955695ab5c7dca0666 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 14 Jun 2016 12:55:08 -0400 Subject: [PATCH 301/320] FIX: move non-admin i18n keys out of admin_js section --- config/locales/client.en.yml | 355 ++++++++++++++++++----------------- 1 file changed, 179 insertions(+), 176 deletions(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 8ebd0082043..f0177aa9dd5 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1979,6 +1979,183 @@ en: create_post: "Reply / See" readonly: "See" + lightbox: + download: "download" + + search_help: + title: 'Search Help' + + keyboard_shortcuts_help: + title: 'Keyboard Shortcuts' + jump_to: + title: 'Jump To' + home: 'g, h Home' + latest: 'g, l Latest' + new: 'g, n New' + unread: 'g, u Unread' + categories: 'g, c Categories' + top: 'g, t Top' + bookmarks: 'g, b Bookmarks' + profile: 'g, p Profile' + messages: 'g, m Messages' + navigation: + title: 'Navigation' + jump: '# Go to post #' + back: 'u Back' + up_down: 'k/j Move selection ↑ ↓' + open: 'o or Enter Open selected topic' + next_prev: 'shift+j/shift+k Next/previous section' + application: + title: 'Application' + create: 'c Create a new topic' + notifications: 'n Open notifications' + hamburger_menu: '= Open hamburger menu' + user_profile_menu: 'p Open user menu' + show_incoming_updated_topics: '. Show updated topics' + search: '/ Search' + help: '? Open keyboard help' + dismiss_new_posts: 'x, r Dismiss New/Posts' + dismiss_topics: 'x, t Dismiss Topics' + log_out: 'shift+z shift+z Log Out' + actions: + title: 'Actions' + bookmark_topic: 'f Toggle bookmark topic' + pin_unpin_topic: 'shift+p Pin/Unpin topic' + share_topic: 'shift+s Share topic' + share_post: 's Share post' + reply_as_new_topic: 't Reply as linked topic' + reply_topic: 'shift+r Reply to topic' + reply_post: 'r Reply to post' + quote_post: 'q Quote post' + like: 'l Like post' + flag: '! Flag post' + bookmark: 'b Bookmark post' + edit: 'e Edit post' + delete: 'd Delete post' + mark_muted: 'm, m Mute topic' + mark_regular: 'm, r Regular (default) topic' + mark_tracking: 'm, t Track topic' + mark_watching: 'm, w Watch topic' + + badges: + earned_n_times: + one: "Earned this badge 1 time" + other: "Earned this badge %{count} times" + granted_on: "Granted %{date}" + others_count: "Others with this badge (%{count})" + title: Badges + allow_title: "available title" + multiple_grant: "awarded multiple times" + badge_count: + one: "1 Badge" + other: "%{count} Badges" + more_badges: + one: "+1 More" + other: "+%{count} More" + granted: + one: "1 granted" + other: "%{count} granted" + select_badge_for_title: Select a badge to use as your title + none: "" + badge_grouping: + getting_started: + name: Getting Started + community: + name: Community + trust_level: + name: Trust Level + other: + name: Other + posting: + name: Posting + + google_search: | +

    Search with Google

    +

    +

    +

    + + tagging: + all_tags: "All Tags" + selector_all_tags: "all tags" + changed: "tags changed:" + tags: "Tags" + choose_for_topic: "choose optional tags for this topic" + delete_tag: "Delete Tag" + delete_confirm: "Are you sure you want to delete that tag?" + rename_tag: "Rename Tag" + rename_instructions: "Choose a new name for the tag:" + sort_by: "Sort by:" + sort_by_count: "count" + sort_by_name: "name" + manage_groups: "Manage Tag Groups" + manage_groups_description: "Define groups to organize tags" + + filters: + without_category: "%{filter} %{tag} topics" + with_category: "%{filter} %{tag} topics in %{category}" + + notifications: + watching: + title: "Watching" + description: "You will automatically watch all new topics in this tag. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic." + tracking: + title: "Tracking" + description: "You will automatically track all new topics in this tag. A count of unread and new posts will appear next to the topic." + regular: + title: "Regular" + description: "You will be notified if someone mentions your @name or replies to your post." + muted: + title: "Muted" + description: "You will not be notified of anything about new topics in this tag, and they will not appear on your unread tab." + + groups: + title: "Tag Groups" + about: "Add tags to groups to manage them more easily." + new: "New Group" + tags_label: "Tags in this group:" + parent_tag_label: "Parent tag:" + parent_tag_placeholder: "Optional" + parent_tag_description: "Tags from this group can't be used unless the parent tag is present." + one_per_topic_label: "Limit one tag per topic from this group" + new_name: "New Tag Group" + save: "Save" + delete: "Delete" + confirm_delete: "Are you sure you want to delete this tag group?" + + topics: + none: + unread: "You have no unread topics." + new: "You have no new topics." + read: "You haven't read any topics yet." + posted: "You haven't posted in any topics yet." + latest: "There are no latest topics." + hot: "There are no hot topics." + bookmarks: "You have no bookmarked topics yet." + top: "There are no top topics." + search: "There are no search results." + bottom: + latest: "There are no more latest topics." + hot: "There are no more hot topics." + posted: "There are no more posted topics." + read: "There are no more read topics." + new: "There are no more new topics." + unread: "There are no more unread topics." + top: "There are no more top topics." + bookmarks: "There are no more bookmarked topics." + search: "There are no more search results." + + invite: + custom_message: "Make your invite a little bit more personal by writing a" + custom_message_link: "custom message" + custom_message_placeholder: "Enter your custom message" + custom_message_template_forum: "Hey, you should join this forum!" + custom_message_template_topic: "Hey, I thought you might enjoy this topic!" + # This section is exported to the javascript for i18n in the admin section admin_js: type_to_filter: "type to filter..." @@ -2876,179 +3053,5 @@ en: add: "Add" filter: "Search (URL or External URL)" - lightbox: - download: "download" - - search_help: - title: 'Search Help' - - keyboard_shortcuts_help: - title: 'Keyboard Shortcuts' - jump_to: - title: 'Jump To' - home: 'g, h Home' - latest: 'g, l Latest' - new: 'g, n New' - unread: 'g, u Unread' - categories: 'g, c Categories' - top: 'g, t Top' - bookmarks: 'g, b Bookmarks' - profile: 'g, p Profile' - messages: 'g, m Messages' - navigation: - title: 'Navigation' - jump: '# Go to post #' - back: 'u Back' - up_down: 'k/j Move selection ↑ ↓' - open: 'o or Enter Open selected topic' - next_prev: 'shift+j/shift+k Next/previous section' - application: - title: 'Application' - create: 'c Create a new topic' - notifications: 'n Open notifications' - hamburger_menu: '= Open hamburger menu' - user_profile_menu: 'p Open user menu' - show_incoming_updated_topics: '. Show updated topics' - search: '/ Search' - help: '? Open keyboard help' - dismiss_new_posts: 'x, r Dismiss New/Posts' - dismiss_topics: 'x, t Dismiss Topics' - log_out: 'shift+z shift+z Log Out' - actions: - title: 'Actions' - bookmark_topic: 'f Toggle bookmark topic' - pin_unpin_topic: 'shift+p Pin/Unpin topic' - share_topic: 'shift+s Share topic' - share_post: 's Share post' - reply_as_new_topic: 't Reply as linked topic' - reply_topic: 'shift+r Reply to topic' - reply_post: 'r Reply to post' - quote_post: 'q Quote post' - like: 'l Like post' - flag: '! Flag post' - bookmark: 'b Bookmark post' - edit: 'e Edit post' - delete: 'd Delete post' - mark_muted: 'm, m Mute topic' - mark_regular: 'm, r Regular (default) topic' - mark_tracking: 'm, t Track topic' - mark_watching: 'm, w Watch topic' - - badges: - earned_n_times: - one: "Earned this badge 1 time" - other: "Earned this badge %{count} times" - granted_on: "Granted %{date}" - others_count: "Others with this badge (%{count})" - title: Badges - allow_title: "available title" - multiple_grant: "awarded multiple times" - badge_count: - one: "1 Badge" - other: "%{count} Badges" - more_badges: - one: "+1 More" - other: "+%{count} More" - granted: - one: "1 granted" - other: "%{count} granted" - select_badge_for_title: Select a badge to use as your title - none: "" - badge_grouping: - getting_started: - name: Getting Started - community: - name: Community - trust_level: - name: Trust Level - other: - name: Other - posting: - name: Posting - - google_search: | -

    Search with Google

    -

    -

    -

    - - tagging: - all_tags: "All Tags" - selector_all_tags: "all tags" - changed: "tags changed:" - tags: "Tags" - choose_for_topic: "choose optional tags for this topic" - delete_tag: "Delete Tag" - delete_confirm: "Are you sure you want to delete that tag?" - rename_tag: "Rename Tag" - rename_instructions: "Choose a new name for the tag:" - sort_by: "Sort by:" - sort_by_count: "count" - sort_by_name: "name" - manage_groups: "Manage Tag Groups" - manage_groups_description: "Define groups to organize tags" - - filters: - without_category: "%{filter} %{tag} topics" - with_category: "%{filter} %{tag} topics in %{category}" - - notifications: - watching: - title: "Watching" - description: "You will automatically watch all new topics in this tag. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic." - tracking: - title: "Tracking" - description: "You will automatically track all new topics in this tag. A count of unread and new posts will appear next to the topic." - regular: - title: "Regular" - description: "You will be notified if someone mentions your @name or replies to your post." - muted: - title: "Muted" - description: "You will not be notified of anything about new topics in this tag, and they will not appear on your unread tab." - - groups: - title: "Tag Groups" - about: "Add tags to groups to manage them more easily." - new: "New Group" - tags_label: "Tags in this group:" - parent_tag_label: "Parent tag:" - parent_tag_placeholder: "Optional" - parent_tag_description: "Tags from this group can't be used unless the parent tag is present." - one_per_topic_label: "Limit one tag per topic from this group" - new_name: "New Tag Group" - save: "Save" - delete: "Delete" - confirm_delete: "Are you sure you want to delete this tag group?" - - topics: - none: - unread: "You have no unread topics." - new: "You have no new topics." - read: "You haven't read any topics yet." - posted: "You haven't posted in any topics yet." - latest: "There are no latest topics." - hot: "There are no hot topics." - bookmarks: "You have no bookmarked topics yet." - top: "There are no top topics." - search: "There are no search results." - bottom: - latest: "There are no more latest topics." - hot: "There are no more hot topics." - posted: "There are no more posted topics." - read: "There are no more read topics." - new: "There are no more new topics." - unread: "There are no more unread topics." - top: "There are no more top topics." - bookmarks: "There are no more bookmarked topics." - search: "There are no more search results." - - invite: - custom_message: "Make your invite a little bit more personal by writing a" - custom_message_link: "custom message" - custom_message_placeholder: "Enter your custom message" - custom_message_template_forum: "Hey, you should join this forum!" - custom_message_template_topic: "Hey, I thought you might enjoy this topic!" +# WARNING! Keys added here will be in the admin_js section. +# Keys that don't belong in admin should be placed earlier in the file. From bdd15d5452e9b1d836f06ebfc702566a217c2994 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 14 Jun 2016 13:40:30 -0400 Subject: [PATCH 302/320] FIX: Don't remove all events, only the ones we created --- .../discourse/components/mount-widget.js.es6 | 14 ++++++++++---- .../discourse/components/topic-progress.js.es6 | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6 index c9310fb66aa..e62390e6940 100644 --- a/app/assets/javascripts/discourse/components/mount-widget.js.es6 +++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6 @@ -16,6 +16,7 @@ export default Ember.Component.extend({ _widgetClass: null, _renderCallback: null, _childEvents: null, + _dispatched: null, init() { this._super(); @@ -31,6 +32,7 @@ export default Ember.Component.extend({ this._childEvents = []; this._connected = []; + this._dispatched = []; }, didInsertElement() { @@ -52,7 +54,10 @@ export default Ember.Component.extend({ }, willDestroyElement() { - this._childEvents.forEach(evt => this.appEvents.off(evt)); + this._dispatched.forEach(evt => { + const [eventName, caller] = evt; + this.appEvents.off(eventName, caller); + }); Ember.run.cancel(this._timeout); }, @@ -73,9 +78,10 @@ export default Ember.Component.extend({ dispatch(eventName, key) { this._childEvents.push(eventName); - this.appEvents.on(eventName, refreshArg => { - this.eventDispatched(eventName, key, refreshArg); - }); + + const caller = refreshArg => this.eventDispatched(eventName, key, refreshArg); + this._dispatched.push([eventName, caller]); + this.appEvents.on(eventName, caller); }, queueRerender(callback) { diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6 index 97b9f3b540d..94c99908af5 100644 --- a/app/assets/javascripts/discourse/components/topic-progress.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6 @@ -95,7 +95,7 @@ export default Ember.Component.extend({ .off("composer:resized", this, this._dock) .off('composer:closed', this, this._dock) .off('topic:scrolled', this, this._dock) - .off('topic:current-post-scrolled') + .off('topic:current-post-scrolled', this, this._topicScrolled) .off('topic-progress:keyboard-trigger'); }, From 9588583244788c3c3a8695f016cc23b88df8dac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 14 Jun 2016 20:01:21 +0200 Subject: [PATCH 303/320] 'Reply as new topic' link in the share dialog --- .../discourse/controllers/share.js.es6 | 5 ++ .../discourse/controllers/topic.js.es6 | 10 +-- .../javascripts/discourse/templates/share.hbs | 4 ++ .../discourse/views/quote-button.js.es6 | 3 +- .../javascripts/discourse/views/share.js.es6 | 64 +++++++++---------- .../discourse/widgets/post-menu.js.es6 | 1 + .../stylesheets/common/base/share_link.scss | 6 ++ 7 files changed, 54 insertions(+), 39 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/share.js.es6 b/app/assets/javascripts/discourse/controllers/share.js.es6 index b276fcf590d..0fff3985221 100644 --- a/app/assets/javascripts/discourse/controllers/share.js.es6 +++ b/app/assets/javascripts/discourse/controllers/share.js.es6 @@ -29,6 +29,11 @@ export default Ember.Controller.extend({ return false; }, + replyAsNewTopic() { + this.get("controllers.topic").send("replyAsNewTopic"); + this.send("close"); + }, + share(source) { var url = source.generateUrl(this.get('link'), this.get('title')); if (source.shouldOpenInPopup) { diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index a89f6927910..2c6d56a021f 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -586,10 +586,10 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }, replyAsNewTopic(post) { - const composerController = this.get('controllers.composer'), - quoteController = this.get('controllers.quote-button'), - quotedText = Quote.build(quoteController.get('post'), quoteController.get('buffer')), - self = this; + const composerController = this.get('controllers.composer'); + const quoteController = this.get('controllers.quote-button'); + post = post || quoteController.get('post'); + const quotedText = Quote.build(post, quoteController.get('buffer')); quoteController.deselectText(); @@ -601,7 +601,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { return Em.isEmpty(quotedText) ? "" : quotedText; }).then(q => { const postUrl = `${location.protocol}//${location.host}${post.get('url')}`; - const postLink = `[${Handlebars.escapeExpression(self.get('model.title'))}](${postUrl})`; + const postLink = `[${Handlebars.escapeExpression(this.get('model.title'))}](${postUrl})`; composerController.get('model').prependText(`${I18n.t("post.continue_discussion", { postLink })}\n\n${q}`, {new_line: true}); }); }, diff --git a/app/assets/javascripts/discourse/templates/share.hbs b/app/assets/javascripts/discourse/templates/share.hbs index c11aca002e4..71bf52b0040 100644 --- a/app/assets/javascripts/discourse/templates/share.hbs +++ b/app/assets/javascripts/discourse/templates/share.hbs @@ -14,6 +14,10 @@ {{share-source source=s title=title action="share"}} {{/each}} +
    + {{fa-icon "plus"}}{{i18n 'topic.create'}} +
    +
    {{fa-icon "close"}}
    diff --git a/app/assets/javascripts/discourse/views/quote-button.js.es6 b/app/assets/javascripts/discourse/views/quote-button.js.es6 index 681523377bc..e0b5e21434f 100644 --- a/app/assets/javascripts/discourse/views/quote-button.js.es6 +++ b/app/assets/javascripts/discourse/views/quote-button.js.es6 @@ -3,7 +3,8 @@ function ignoreElements(e) { const $target = $(e.target); return $target.hasClass('quote-button') || $target.closest('.create').length || - $target.closest('.reply-new').length; + $target.closest('.reply-new').length || + $target.closest('.share').length; } export default Ember.View.extend({ diff --git a/app/assets/javascripts/discourse/views/share.js.es6 b/app/assets/javascripts/discourse/views/share.js.es6 index 96029481224..abaa6c82b78 100644 --- a/app/assets/javascripts/discourse/views/share.js.es6 +++ b/app/assets/javascripts/discourse/views/share.js.es6 @@ -1,3 +1,5 @@ +import computed from 'ember-addons/ember-computed-decorators'; +import { observes } from 'ember-addons/ember-computed-decorators'; import { wantsNewWindow } from 'discourse/lib/intercept-click'; export default Ember.View.extend({ @@ -5,45 +7,43 @@ export default Ember.View.extend({ elementId: 'share-link', classNameBindings: ['hasLink'], - hasLink: function() { - if (!Ember.isEmpty(this.get('controller.link'))) return 'visible'; - return null; - }.property('controller.link'), + @computed('controller.link') + hasLink(link) { + return !Ember.isEmpty(link) ? 'visible' : null; + }, - linkChanged: function() { - const self = this; - if (!Ember.isEmpty(this.get('controller.link'))) { - Em.run.next(function() { - if (!self.capabilities.touch) { - var $linkInput = $('#share-link input'); - $linkInput.val(self.get('controller.link')); + @observes('controller.link') + linkChanged() { + const link = this.get('controller.link'); + if (!Ember.isEmpty(link)) { + Ember.run.next(() => { + if (!this.capabilities.touch) { + const $linkInput = $('#share-link input'); + $linkInput.val(link); // Wait for the fade-in transition to finish before selecting the link: - window.setTimeout(function() { - $linkInput.select().focus(); - }, 160); + window.setTimeout(() => $linkInput.select().focus(), 160); } else { - var $linkForTouch = $('#share-link .share-for-touch a'); - $linkForTouch.attr('href',self.get('controller.link')); - $linkForTouch.html(self.get('controller.link')); - var range = window.document.createRange(); + const $linkForTouch = $('#share-link .share-for-touch a'); + $linkForTouch.attr('href', link); + $linkForTouch.html(link); + const range = window.document.createRange(); range.selectNode($linkForTouch[0]); window.getSelection().addRange(range); } }); } - }.observes('controller.link'), + }, - didInsertElement: function() { - var self = this, - $html = $('html'); + didInsertElement() { + const self = this; + const $html = $('html'); - $html.on('mousedown.outside-share-link', function(e) { + $html.on('mousedown.outside-share-link', e => { // Use mousedown instead of click so this event is handled before routing occurs when a // link is clicked (which is a click event) while the share dialog is showing. - if (self.$().has(e.target).length !== 0) { return; } - - self.get('controller').send('close'); + if (this.$().has(e.target).length !== 0) { return; } + this.get('controller').send('close'); return true; }); @@ -58,9 +58,7 @@ export default Ember.View.extend({ const shareLinkWidth = $shareLink.width(); let x = $currentTargetOffset.left - (shareLinkWidth / 2); - if (x < 25) { - x = 25; - } + if (x < 25) { x = 25; } if (x + shareLinkWidth > $(window).width()) { x -= shareLinkWidth / 2; } @@ -84,7 +82,7 @@ export default Ember.View.extend({ this.appEvents.on('share:url', (url, $target) => showPanel($target, url)); - $html.on('click.discoure-share-link', '[data-share-url]', function(e) { + $html.on('click.discoure-share-link', '[data-share-url]', e => { // if they want to open in a new tab, let it so if (wantsNewWindow(e)) { return true; } @@ -98,14 +96,14 @@ export default Ember.View.extend({ return false; }); - $html.on('keydown.share-view', function(e){ + $html.on('keydown.share-view', e => { if (e.keyCode === 27) { - self.get('controller').send('close'); + this.get('controller').send('close'); } }); }, - willDestroyElement: function() { + willDestroyElement() { this.get('controller').send('close'); $('html').off('click.discoure-share-link') diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6 index c2d474ae874..f8b6f6f40a3 100644 --- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6 @@ -114,6 +114,7 @@ registerButton('replies', (attrs, state, siteSettings) => { registerButton('share', attrs => { return { action: 'share', + className: 'share', title: 'post.controls.share', icon: 'link', data: { diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss index 2b9b6b57157..33c39c86f86 100644 --- a/app/assets/stylesheets/common/base/share_link.scss +++ b/app/assets/stylesheets/common/base/share_link.scss @@ -42,6 +42,12 @@ float: left; font-size: 1.571em; } + .reply-as-new-topic { + float: left; + .fa { + margin-right: 5px; + } + } .link { margin-right: 2px; float: right; From 55b300bae1115314ab42c923e79ec8a4d6426ecc Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 14 Jun 2016 11:45:50 -0700 Subject: [PATCH 304/320] better align reply action on link dialog --- app/assets/stylesheets/common/base/share_link.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss index 33c39c86f86..0f74cb0e76e 100644 --- a/app/assets/stylesheets/common/base/share_link.scss +++ b/app/assets/stylesheets/common/base/share_link.scss @@ -44,6 +44,8 @@ } .reply-as-new-topic { float: left; + line-height: 22px; + margin-left: 8px; .fa { margin-right: 5px; } From 7efd9359ec0995ac0d87e334e9705d838ea2f746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 14 Jun 2016 20:55:58 +0200 Subject: [PATCH 305/320] reply as new topic requires a post --- app/assets/javascripts/discourse/controllers/share.js.es6 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/share.js.es6 b/app/assets/javascripts/discourse/controllers/share.js.es6 index 0fff3985221..5eb9facd6e0 100644 --- a/app/assets/javascripts/discourse/controllers/share.js.es6 +++ b/app/assets/javascripts/discourse/controllers/share.js.es6 @@ -30,7 +30,11 @@ export default Ember.Controller.extend({ }, replyAsNewTopic() { - this.get("controllers.topic").send("replyAsNewTopic"); + const topicController = this.get("controllers.topic"); + const postStream = topicController.get("model.postStream"); + const postId = postStream.findPostIdForPostNumber(this.get("postNumber")); + const post = postStream.findLoadedPost(postId); + topicController.send("replyAsNewTopic", post); this.send("close"); }, From c860bd07811d60efb3fc53bfdfea4276c72118eb Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Tue, 14 Jun 2016 12:27:17 -0700 Subject: [PATCH 306/320] remove Google+ as default from share link sorry Google! It was a nice try! --- config/site_settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/site_settings.yml b/config/site_settings.yml index 2d5b7f45c11..a1dad349973 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -135,7 +135,7 @@ basic: share_links: client: true type: list - default: 'twitter|facebook|google+|email' + default: 'twitter|facebook|email' choices: - twitter - facebook From af4391bbda8eb3ec78bb1ff992b7199b6c2b910f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 14 Jun 2016 16:37:34 -0400 Subject: [PATCH 307/320] UX: Don't show right arrow in quotes --- app/assets/javascripts/discourse/widgets/post-cooked.js.es6 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 index f98a90eb1da..3c0c0a1332c 100644 --- a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 @@ -162,12 +162,7 @@ export default class PostCooked { // If it's the same topic as ours, build the URL from the topic object if (this.attrs.topicId === asideTopicId) { navLink = ``; - } else { - // Made up slug should be replaced with canonical URL - const asideLink = Discourse.getURL("/t/via-quote/") + asideTopicId + "/" + postNumber; - navLink = ``; } - } else { // assume the same topic navLink = ``; From 0f809d499391416715776656994cf5bba56ab88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 14 Jun 2016 23:03:34 +0200 Subject: [PATCH 308/320] FIX: only show the reply as new topic when user can actually reply as new topic --- app/assets/javascripts/discourse/controllers/share.js.es6 | 1 + app/assets/javascripts/discourse/templates/share.hbs | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/share.js.es6 b/app/assets/javascripts/discourse/controllers/share.js.es6 index 5eb9facd6e0..c7cbe465157 100644 --- a/app/assets/javascripts/discourse/controllers/share.js.es6 +++ b/app/assets/javascripts/discourse/controllers/share.js.es6 @@ -6,6 +6,7 @@ export default Ember.Controller.extend({ needs: ['topic'], title: Ember.computed.alias('controllers.topic.model.title'), + canReplyAsNewTopic: Ember.computed.alias('controllers.topic.model.details.can_reply_as_new_topic'), @computed('type', 'postNumber') shareTitle(type, postNumber) { diff --git a/app/assets/javascripts/discourse/templates/share.hbs b/app/assets/javascripts/discourse/templates/share.hbs index 71bf52b0040..65b33218845 100644 --- a/app/assets/javascripts/discourse/templates/share.hbs +++ b/app/assets/javascripts/discourse/templates/share.hbs @@ -14,9 +14,11 @@ {{share-source source=s title=title action="share"}} {{/each}} -
    - {{fa-icon "plus"}}{{i18n 'topic.create'}} -
    + {{#if canReplyAsNewTopic}} +
    + {{fa-icon "plus"}}{{i18n 'topic.create'}} +
    + {{/if}}
    {{fa-icon "close"}} From 4cd19ee26eddb5c2432763421af37d46056e522a Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 14 Jun 2016 17:13:43 -0400 Subject: [PATCH 309/320] FIX: Avoid weird formatting for decloaked posts --- app/assets/javascripts/discourse/widgets/post.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6 index 2ba179a9e80..a3796790c8d 100644 --- a/app/assets/javascripts/discourse/widgets/post.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post.js.es6 @@ -384,7 +384,7 @@ export default createWidget('post', { shadowTree: true, buildAttributes(attrs) { - return attrs.height ? { style: `height: ${attrs.height}px` } : undefined; + return attrs.height ? { style: `min-height: ${attrs.height}px` } : undefined; }, buildId(attrs) { From 84a1b863a67eeb10be306a69cf1b8de02874ba4f Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 15 Jun 2016 12:38:47 +1000 Subject: [PATCH 310/320] UX: add link to watched topics from prefs page --- app/assets/javascripts/discourse/models/user.js.es6 | 2 ++ .../javascripts/discourse/templates/user/preferences.hbs | 4 ++++ config/locales/client.en.yml | 1 + 3 files changed, 7 insertions(+) diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index 9797cec04f5..666fc5614b7 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -94,6 +94,8 @@ const User = RestModel.extend({ mutedTopicsPath: url('/latest?state=muted'), + watchingTopicsPath: url('/latest?state=watching'), + @computed("username") username_lower(username) { return username.toLowerCase(); diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs index a69a8b6295f..e33b03afebe 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs @@ -255,6 +255,10 @@ {{category-group categories=model.watchedCategories blacklist=selectedCategories}}
    {{i18n 'user.watched_categories_instructions'}}
    +
    + {{i18n 'user.watched_topics_link'}} +
    +
    {{category-group categories=model.trackedCategories blacklist=selectedCategories}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index f0177aa9dd5..e73a69971b5 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -535,6 +535,7 @@ en: muted_users: "Muted" muted_users_instructions: "Suppress all notifications from these users." muted_topics_link: "Show muted topics" + watched_topics_link: "Show watched topics" automatically_unpin_topics: "Automatically unpin topics when I reach the bottom." staff_counters: From 8d46727d670801f61f3c8cca56497bdbf5006014 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 13 Jun 2016 18:21:14 +0800 Subject: [PATCH 311/320] FEATURE: Poll UI Builder. --- .../components/composer-editor.js.es6 | 9 +- .../discourse/controllers/composer.js.es6 | 8 +- .../discourse/templates/composer.hbs | 3 +- .../controllers/poll-ui-builder.js.es6 | 158 ++++++++++++ .../templates/modals/poll-ui-builder.hbs | 57 +++++ .../initializers/add-poll-ui-builder.js.es6 | 30 +++ .../javascripts/views/poll-ui-builder.js.es6 | 8 + .../stylesheets/common/poll-ui-builder.scss | 18 ++ plugins/poll/config/locales/client.en.yml | 23 ++ plugins/poll/plugin.rb | 1 + .../controllers/poll-ui-builder-test.js.es6 | 225 ++++++++++++++++++ 11 files changed, 529 insertions(+), 11 deletions(-) create mode 100644 plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 create mode 100644 plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs create mode 100644 plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6 create mode 100644 plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6 create mode 100644 plugins/poll/assets/stylesheets/common/poll-ui-builder.scss create mode 100644 plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6 index 76d89193cbb..0b5d9c4e6f5 100644 --- a/app/assets/javascripts/discourse/components/composer-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6 @@ -362,7 +362,7 @@ export default Ember.Component.extend({ this._resetUpload(true); }, - showOptions() { + showOptions(toolbarEvent) { // long term we want some smart positioning algorithm in popup-menu // the problem is that positioning in a fixed panel is a nightmare // cause offsetParent can end up returning a fixed element and then @@ -388,9 +388,8 @@ export default Ember.Component.extend({ left = replyWidth - popupWidth - 40; } - this.sendAction('showOptions', { position: "absolute", - left: left, - top: top }); + this.sendAction('showOptions', toolbarEvent, + { position: "absolute", left, top }); }, showUploadModal(toolbarEvent) { @@ -420,7 +419,7 @@ export default Ember.Component.extend({ sendAction: 'showUploadModal' }); - if (this.get('canWhisper')) { + if (this.get("popupMenuOptions").some(option => option.condition)) { toolbar.addButton({ id: 'options', group: 'extras', diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 18784fa01e8..8f4b16701f6 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -64,7 +64,6 @@ export default Ember.Controller.extend({ init() { this._super(); - const self = this addPopupMenuOptionsCallback(function() { return { @@ -114,14 +113,12 @@ export default Ember.Controller.extend({ @computed("model.composeState") popupMenuOptions(composeState) { - const self = this; - if (composeState === 'open') { return _popupMenuOptionsCallbacks.map(callback => { let option = callback(); if (option.condition) { - option.condition = self.get(option.condition); + option.condition = this.get(option.condition); } else { option.condition = true; } @@ -193,7 +190,8 @@ export default Ember.Controller.extend({ this.toggleProperty('showToolbar'); }, - showOptions(loc) { + showOptions(toolbarEvent, loc) { + this.set('toolbarEvent', toolbarEvent); this.appEvents.trigger('popup-menu:open', loc); this.set('optionsVisible', true); }, diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index 2e3c6636b97..06f01ee8367 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -6,7 +6,7 @@ {{#each popupMenuOptions as |option|}} {{#if option.condition}}
  • - {{d-button action=option.action icon=option.icon label=option.label}} + {{d-button action=option.action icon=option.icon label=option.label}}
    • {{/if}} {{/each}} @@ -90,6 +90,7 @@ composer=model lastValidatedAt=lastValidatedAt canWhisper=canWhisper + popupMenuOptions=popupMenuOptions draftStatus=model.draftStatus isUploading=isUploading groupsMentioned="groupsMentioned" diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 new file mode 100644 index 00000000000..6d10e459d4b --- /dev/null +++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 @@ -0,0 +1,158 @@ +import { default as computed, observes } from 'ember-addons/ember-computed-decorators'; + +export default Ember.Controller.extend({ + needs: ['modal'], + + init() { + this._super(); + this._setupPoll(); + }, + + @computed + pollTypes() { + return [I18n.t("poll.ui_builder.poll_type.number"), I18n.t("poll.ui_builder.poll_type.multiple")].map(type => { + return { name: type, value: type }; + }); + }, + + @computed("pollType", "pollOptionsCount") + isMultiple(pollType, count) { + return (pollType === I18n.t("poll.ui_builder.poll_type.multiple")) && count > 0; + }, + + @computed("pollType") + isNumber(pollType) { + return pollType === I18n.t("poll.ui_builder.poll_type.number"); + }, + + @computed("isNumber", "isMultiple") + showMinMax(isNumber, isMultiple) { + return isNumber || isMultiple; + }, + + @computed("pollOptions") + pollOptionsCount(pollOptions) { + if (pollOptions.length === 0) return 0; + + let length = 0; + + pollOptions.split("\n").forEach(option => { + if (option.length !== 0) length += 1; + }); + + return length; + }, + + @observes("isMultiple", "isNumber", "pollOptionsCount") + _setPollMax() { + const isMultiple = this.get("isMultiple"); + const isNumber = this.get("isNumber"); + if (!isMultiple && !isNumber) return; + + if (isMultiple) { + this.set("pollMax", this.get("pollOptionsCount")); + } else if (isNumber) { + this.set("pollMax", this.siteSettings.poll_maximum_options); + } + }, + + @computed("isMultiple", "isNumber", "pollOptionsCount") + pollMinOptions(isMultiple, isNumber, count) { + if (!isMultiple && !isNumber) return; + + if (isMultiple) { + return this._comboboxOptions(1, count + 1); + } else if (isNumber) { + return this._comboboxOptions(1, this.siteSettings.poll_maximum_options + 1); + } + }, + + @computed("isMultiple", "isNumber", "pollOptionsCount", "pollMin", "pollStep") + pollMaxOptions(isMultiple, isNumber, count, pollMin, pollStep) { + if (!isMultiple && !isNumber) return; + var range = []; + const pollMinInt = parseInt(pollMin); + + if (isMultiple) { + return this._comboboxOptions(pollMinInt + 1, count + 1); + } else if (isNumber) { + const pollStepInt = parseInt(pollStep); + return this._comboboxOptions(pollMinInt + 1, pollMinInt + (this.siteSettings.poll_maximum_options * pollStepInt)); + } + }, + + @computed("isNumber", "pollMax") + pollStepOptions(isNumber, pollMax) { + if (!isNumber) return; + + return this._comboboxOptions(1, parseInt(pollMax) + 1); + }, + + @computed("isNumber", "showMinMax", "pollName", "pollType", "publicPoll", "pollOptions", "pollMin", "pollMax", "pollStep") + pollOutput(isNumber, showMinMax, pollName, pollType, publicPoll, pollOptions, pollMin, pollMax, pollStep) { + let pollHeader = '[poll'; + let output = ''; + + if (pollName) pollHeader += ` name=${pollName.replace(' ', '-')}`; + if (pollType) pollHeader += ` type=${pollType}`; + if (pollMin && showMinMax) pollHeader += ` min=${pollMin}`; + if (pollMax) pollHeader += ` max=${pollMax}`; + if (isNumber) pollHeader += ` step=${pollStep}`; + if (publicPoll) pollHeader += ' public=true'; + pollHeader += ']' + output += `${pollHeader}\n`; + + if (pollOptions.length > 0 && !isNumber) { + output += `${pollOptions.split("\n").map(option => `* ${option}`).join("\n")}\n`; + } + + output += '[/poll]'; + return output; + }, + + @computed("pollOptionsCount", "isNumber") + disableInsert(count, isNumber) { + if (isNumber) { + return false; + } else { + return count < 2; + } + }, + + @computed("disableInsert") + minNumOfOptionsValidation(disableInsert) { + let options = { ok: true }; + + if (disableInsert) { + options = { failed: true, reason: I18n.t("poll.ui_builder.help.options_count") }; + } + + return Discourse.InputValidation.create(options); + }, + + _comboboxOptions(start_index, end_index) { + return _.range(start_index, end_index).map(number => { + return { value: number, name: number } + }) + }, + + _setupPoll() { + this.setProperties({ + pollName: '', + pollNamePlaceholder: I18n.t("poll.ui_builder.poll_name.placeholder"), + pollType: null, + publicPoll: false, + pollOptions: '', + pollMin: 1, + pollMax: null, + pollStep: 1 + }); + }, + + actions: { + insertPoll() { + this.get("toolbarEvent").addText(this.get("pollOutput")); + this.send("closeModal"); + } + } +}); diff --git a/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs new file mode 100644 index 00000000000..c800db9aff9 --- /dev/null +++ b/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs @@ -0,0 +1,57 @@ +
    +
    +
    + + {{input name="poll-name" value=pollName placeholder=pollNamePlaceholder}} +
    + +
    + + {{combo-box content=pollTypes + value=pollType + valueAttribute="value" + none="poll.ui_builder.poll_type.regular"}} + + {{#if showMinMax}} + + {{combo-box content=pollMinOptions + value=pollMin + valueAttribute="value" + class="poll-options-min"}} + + + {{combo-box content=pollMaxOptions + value=pollMax + valueAttribute="value" + class="poll-options-max"}} + + {{#if isNumber}} + + {{combo-box content=pollStepOptions + value=pollStep + valueAttribute="value" + class="poll-options-step"}} + {{/if}} + {{/if}} +
    + +
    + +
    + + {{#unless isNumber}} +
    + + {{input-tip validation=minNumOfOptionsValidation}} + {{d-editor value=pollOptions}} +
    + {{/unless}} +
    +
    + +
    + {{d-button action="insertPoll" class='btn-primary' label='poll.ui_builder.insert' disabled=disableInsert}} +
    diff --git a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6 new file mode 100644 index 00000000000..e1d88715ab0 --- /dev/null +++ b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6 @@ -0,0 +1,30 @@ +import { withPluginApi } from 'discourse/lib/plugin-api'; +import showModal from 'discourse/lib/show-modal'; + +function initializePollUIBuilder(api) { + const ComposerController = api.container.lookup("controller:composer"); + + ComposerController.reopen({ + actions: { + showPollBuilder() { + showModal("poll-ui-builder").set("toolbarEvent", this.get("toolbarEvent")); + } + } + }); + + api.addToolbarPopupMenuOptionsCallback(function() { + return { + action: 'showPollBuilder', + icon: 'bar-chart-o', + label: 'poll.ui_builder.title' + }; + }); +} + +export default { + name: "add-poll-ui-builder", + + initialize() { + withPluginApi('0.1', initializePollUIBuilder); + } +}; diff --git a/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6 new file mode 100644 index 00000000000..6ce0bf58203 --- /dev/null +++ b/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6 @@ -0,0 +1,8 @@ +import ModalBodyView from "discourse/views/modal-body"; + +export default ModalBodyView.extend({ + needs: ['modal'], + + templateName: 'modals/poll-ui-builder', + title: I18n.t("poll.ui_builder.title") +}); diff --git a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss new file mode 100644 index 00000000000..a8467a3abbd --- /dev/null +++ b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss @@ -0,0 +1,18 @@ +.poll-ui-builder-form { + .input-group { + padding: 10px; + } + + label { + font-weight: bold; + display: inline; + } + + .combobox { + margin-right: 5px; + } + + .poll-options-min, .poll-options-max, .poll-options-step { + width: 70px !important; + } +} diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml index 4344b85bd13..7113b022d74 100644 --- a/plugins/poll/config/locales/client.en.yml +++ b/plugins/poll/config/locales/client.en.yml @@ -68,3 +68,26 @@ en: error_while_toggling_status: "There was an error while toggling the status of this poll." error_while_casting_votes: "There was an error while casting your votes." error_while_fetching_voters: "There was an error while displaying the voters." + + ui_builder: + title: Poll Builder + insert: Insert Poll + reset: Reset Poll + help: + options_count: You must provide a minimum of 2 options. + poll_name: + label: Poll Name + placeholder: Enter Poll Name + poll_type: + label: Poll Type + regular: regular + multiple: multiple + number: number + poll_config: + max: Max + min: Min + step: Step + poll_public: + label: Make Public Poll + poll_options: + label: "Poll Choices: (one option per line)" diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb index 075be098317..da979c275ba 100644 --- a/plugins/poll/plugin.rb +++ b/plugins/poll/plugin.rb @@ -7,6 +7,7 @@ enabled_site_setting :poll_enabled register_asset "stylesheets/common/poll.scss" +register_asset "stylesheets/common/poll-ui-builder.scss" register_asset "stylesheets/desktop/poll.scss", :desktop register_asset "stylesheets/mobile/poll.scss", :mobile diff --git a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 new file mode 100644 index 00000000000..fb4941838e3 --- /dev/null +++ b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 @@ -0,0 +1,225 @@ +moduleFor("controller:poll-ui-builder", "controller:poll-ui-builder", { + needs: ['controller:modal'] +}); + +test("isMultiple", function() { + const controller = this.subject(); + + controller.setProperties({ + pollType: I18n.t("poll.ui_builder.poll_type.multiple"), + pollOptionsCount: 1 + }); + + equal(controller.get("isMultiple"), true, "it should be true"); + + controller.set("pollOptionsCount", 0); + + equal(controller.get("isMultiple"), false, "it should be false"); + + controller.setProperties({ pollType: "random", pollOptionsCount: 1 }); + + equal(controller.get("isMultiple"), false, "it should be false"); +}); + +test("isNumber", function() { + const controller = this.subject(); + controller.siteSettings = Discourse.SiteSettings; + + controller.set("pollType", "random"); + + equal(controller.get("isNumber"), false, "it should be false"); + + controller.set("pollType", I18n.t("poll.ui_builder.poll_type.number")); + + equal(controller.get("isNumber"), true, "it should be true"); +}); + +test("showMinMax", function() { + const controller = this.subject(); + controller.siteSettings = Discourse.SiteSettings; + + controller.setProperties({ + isNumber: true, + isMultiple: false + }); + + equal(controller.get("showMinMax"), true, "it should be true"); + + controller.setProperties({ + isNumber: false, + isMultiple: true + }); + + equal(controller.get("showMinMax"), true, "it should be true"); +}); + +test("pollOptionsCount", function() { + const controller = this.subject(); + controller.siteSettings = Discourse.SiteSettings; + + controller.set("pollOptions", "1\n2\n") + + equal(controller.get("pollOptionsCount"), 2, "it should equal 2"); + + controller.set("pollOptions", "") + + equal(controller.get("pollOptionsCount"), 0, "it should equal 0"); +}); + +test("pollMinOptions", function() { + const controller = this.subject(); + controller.siteSettings = Discourse.SiteSettings; + + controller.setProperties({ + isMultiple: true, + pollOptionsCount: 1 + }); + + deepEqual(controller.get("pollMinOptions"), [{ name: 1, value: 1 }], "it should return the right options"); + + controller.set("pollOptionsCount", 2); + + deepEqual(controller.get("pollMinOptions"), [ + { name: 1, value: 1 }, { name: 2, value: 2 } + ], "it should return the right options"); + + controller.set("isNumber", true); + controller.siteSettings.poll_maximum_options = 2; + + deepEqual(controller.get("pollMinOptions"), [ + { name: 1, value: 1 }, { name: 2, value: 2 } + ], "it should return the right options"); +}); + +test("pollMaxOptions", function() { + const controller = this.subject(); + controller.siteSettings = Discourse.SiteSettings; + + controller.setProperties({ isMultiple: true, pollOptionsCount: 1, pollMin: 1 }); + + deepEqual(controller.get("pollMaxOptions"), [], "it should return the right options"); + + controller.set("pollOptionsCount", 2); + + deepEqual(controller.get("pollMaxOptions"), [ + { name: 2, value: 2 } + ], "it should return the right options"); + + controller.siteSettings.poll_maximum_options = 3; + controller.setProperties({ isMultiple: false, isNumber: true, pollStep: 2, pollMin: 1 }); + + deepEqual(controller.get("pollMaxOptions"), [ + { name: 2, value: 2 }, + { name: 3, value: 3 }, + { name: 4, value: 4 }, + { name: 5, value: 5 }, + { name: 6, value: 6 } + ], "it should return the right options"); +}); + +test("pollStepOptions", function() { + const controller = this.subject(); + controller.siteSettings = Discourse.SiteSettings; + controller.siteSettings.poll_maximum_options = 3; + + controller.set("isNumber", false); + + equal(controller.get("pollStepOptions"), null, "is should return null"); + + controller.setProperties({ isNumber: true }); + + deepEqual(controller.get("pollStepOptions"), [ + { name: 1, value: 1 }, + { name: 2, value: 2 }, + { name: 3, value: 3 } + ], "it should return the right options"); +}); + +test("disableInsert", function() { + const controller = this.subject(); + controller.siteSettings = Discourse.SiteSettings; + + controller.setProperties({ isNumber: true }); + + equal(controller.get("disableInsert"), false, "it should be false"); + + controller.setProperties({ isNumber: false, pollOptionsCount: 3 }); + + equal(controller.get("disableInsert"), false, "it should be false"); + + controller.setProperties({ isNumber: false, pollOptionsCount: 1 }); + + equal(controller.get("disableInsert"), true, "it should be true"); +}); + +test("number pollOutput", function() { + const controller = this.subject(); + controller.siteSettings = Discourse.SiteSettings; + controller.siteSettings.poll_maximum_options = 20; + + controller.setProperties({ + isNumber: true, + pollType: I18n.t("poll.ui_builder.poll_type.number"), + pollMin: 1 + }); + + equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output"); + + controller.set("pollName", 'test'); + + equal(controller.get("pollOutput"), "[poll name=test type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output"); + + controller.set("pollName", 'test poll'); + + equal(controller.get("pollOutput"), "[poll name=test-poll type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output"); + + controller.set("pollStep", 2); + + equal(controller.get("pollOutput"), "[poll name=test-poll type=number min=1 max=20 step=2]\n[/poll]", "it should return the right output"); + + controller.set("publicPoll", true); + + equal(controller.get("pollOutput"), "[poll name=test-poll type=number min=1 max=20 step=2 public=true]\n[/poll]", "it should return the right output"); +}); + +test("regular pollOutput", function() { + const controller = this.subject(); + controller.siteSettings = Discourse.SiteSettings; + controller.siteSettings.poll_maximum_options = 20; + + controller.set("pollOptions", "1\n2"); + + equal(controller.get("pollOutput"), "[poll]\n* 1\n* 2\n[/poll]", "it should return the right output"); + + controller.set("pollName", "test"); + + equal(controller.get("pollOutput"), "[poll name=test]\n* 1\n* 2\n[/poll]", "it should return the right output"); + + controller.set("publicPoll", "true"); + + equal(controller.get("pollOutput"), "[poll name=test public=true]\n* 1\n* 2\n[/poll]", "it should return the right output"); +}); + + +test("multiple pollOutput", function() { + const controller = this.subject(); + controller.siteSettings = Discourse.SiteSettings; + controller.siteSettings.poll_maximum_options = 20; + + controller.setProperties({ + isMultiple: true, + pollType: I18n.t("poll.ui_builder.poll_type.multiple"), + pollMin: 1, + pollOptions: "1\n2" + }); + + equal(controller.get("pollOutput"), "[poll type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]", "it should return the right output"); + + controller.set("pollName", "test"); + + equal(controller.get("pollOutput"), "[poll name=test type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]", "it should return the right output"); + + controller.set("publicPoll", "true"); + + equal(controller.get("pollOutput"), "[poll name=test type=multiple min=1 max=2 public=true]\n* 1\n* 2\n[/poll]", "it should return the right output"); +}); From ae5a033469bce7d2a054ff9c9e5bc09221388b77 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 14 Jun 2016 16:11:45 +0800 Subject: [PATCH 312/320] Start checking eslint in plugins. --- .travis.yml | 1 + .../components/poll-results-number-voters.js.es6 | 1 - .../components/poll-results-standard-voters.js.es6 | 1 - .../javascripts/controllers/poll-ui-builder.js.es6 | 14 ++++---------- .../assets/javascripts/controllers/poll.js.es6 | 1 - plugins/poll/assets/javascripts/views/poll.js.es6 | 2 -- 6 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43ef9e81663..6a2ca9143a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,7 @@ before_install: - eslint app/assets/javascripts - eslint --ext .es6 app/assets/javascripts - eslint --ext .es6 test/javascripts + - eslint --ext .es6 plugins/**/assets/javascripts - eslint test/javascripts before_script: diff --git a/plugins/poll/assets/javascripts/components/poll-results-number-voters.js.es6 b/plugins/poll/assets/javascripts/components/poll-results-number-voters.js.es6 index e75ad84cbbf..412cc8acd20 100644 --- a/plugins/poll/assets/javascripts/components/poll-results-number-voters.js.es6 +++ b/plugins/poll/assets/javascripts/components/poll-results-number-voters.js.es6 @@ -1,5 +1,4 @@ import computed from 'ember-addons/ember-computed-decorators'; -import User from 'discourse/models/user'; import PollVoters from 'discourse/plugins/poll/components/poll-voters'; export default PollVoters.extend({ diff --git a/plugins/poll/assets/javascripts/components/poll-results-standard-voters.js.es6 b/plugins/poll/assets/javascripts/components/poll-results-standard-voters.js.es6 index 80dc1ef8b3f..50332f4aeff 100644 --- a/plugins/poll/assets/javascripts/components/poll-results-standard-voters.js.es6 +++ b/plugins/poll/assets/javascripts/components/poll-results-standard-voters.js.es6 @@ -1,5 +1,4 @@ import computed from 'ember-addons/ember-computed-decorators'; -import User from 'discourse/models/user'; import PollVoters from 'discourse/plugins/poll/components/poll-voters'; export default PollVoters.extend({ diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 index 6d10e459d4b..ce139cd4597 100644 --- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 +++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 @@ -70,7 +70,6 @@ export default Ember.Controller.extend({ @computed("isMultiple", "isNumber", "pollOptionsCount", "pollMin", "pollStep") pollMaxOptions(isMultiple, isNumber, count, pollMin, pollStep) { if (!isMultiple && !isNumber) return; - var range = []; const pollMinInt = parseInt(pollMin); if (isMultiple) { @@ -84,7 +83,6 @@ export default Ember.Controller.extend({ @computed("isNumber", "pollMax") pollStepOptions(isNumber, pollMax) { if (!isNumber) return; - return this._comboboxOptions(1, parseInt(pollMax) + 1); }, @@ -99,7 +97,7 @@ export default Ember.Controller.extend({ if (pollMax) pollHeader += ` max=${pollMax}`; if (isNumber) pollHeader += ` step=${pollStep}`; if (publicPoll) pollHeader += ' public=true'; - pollHeader += ']' + pollHeader += ']'; output += `${pollHeader}\n`; if (pollOptions.length > 0 && !isNumber) { @@ -112,11 +110,7 @@ export default Ember.Controller.extend({ @computed("pollOptionsCount", "isNumber") disableInsert(count, isNumber) { - if (isNumber) { - return false; - } else { - return count < 2; - } + return isNumber ? false : (count < 2); }, @computed("disableInsert") @@ -132,8 +126,8 @@ export default Ember.Controller.extend({ _comboboxOptions(start_index, end_index) { return _.range(start_index, end_index).map(number => { - return { value: number, name: number } - }) + return { value: number, name: number }; + }); }, _setupPoll() { diff --git a/plugins/poll/assets/javascripts/controllers/poll.js.es6 b/plugins/poll/assets/javascripts/controllers/poll.js.es6 index 841a3beb8ab..acf63314c4f 100644 --- a/plugins/poll/assets/javascripts/controllers/poll.js.es6 +++ b/plugins/poll/assets/javascripts/controllers/poll.js.es6 @@ -147,7 +147,6 @@ export default Ember.Controller.extend({ }).then(results => { const poll = results.poll; const votes = results.vote; - const currentUser = this.currentUser; this.setProperties({ vote: votes, showResults: true }); this.set("model", Em.Object.create(poll)); diff --git a/plugins/poll/assets/javascripts/views/poll.js.es6 b/plugins/poll/assets/javascripts/views/poll.js.es6 index ac739b3f429..c9d6e632e34 100644 --- a/plugins/poll/assets/javascripts/views/poll.js.es6 +++ b/plugins/poll/assets/javascripts/views/poll.js.es6 @@ -1,5 +1,3 @@ -import { on } from "ember-addons/ember-computed-decorators"; - export default Em.View.extend({ templateName: "poll", classNames: ["poll"], From e1cfe7536c1817c5b481df8369a8975884a02e1a Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 15 Jun 2016 12:54:52 +0800 Subject: [PATCH 313/320] FIX: Add default values when no value has been selected. --- .../assets/javascripts/controllers/poll-ui-builder.js.es6 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 index ce139cd4597..b8fa691cd87 100644 --- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 +++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 @@ -70,12 +70,12 @@ export default Ember.Controller.extend({ @computed("isMultiple", "isNumber", "pollOptionsCount", "pollMin", "pollStep") pollMaxOptions(isMultiple, isNumber, count, pollMin, pollStep) { if (!isMultiple && !isNumber) return; - const pollMinInt = parseInt(pollMin); + const pollMinInt = parseInt(pollMin) || 1; if (isMultiple) { return this._comboboxOptions(pollMinInt + 1, count + 1); } else if (isNumber) { - const pollStepInt = parseInt(pollStep); + const pollStepInt = parseInt(pollStep) || 1; return this._comboboxOptions(pollMinInt + 1, pollMinInt + (this.siteSettings.poll_maximum_options * pollStepInt)); } }, @@ -83,7 +83,7 @@ export default Ember.Controller.extend({ @computed("isNumber", "pollMax") pollStepOptions(isNumber, pollMax) { if (!isNumber) return; - return this._comboboxOptions(1, parseInt(pollMax) + 1); + return this._comboboxOptions(1, (parseInt(pollMax) || 1) + 1); }, @computed("isNumber", "showMinMax", "pollName", "pollType", "publicPoll", "pollOptions", "pollMin", "pollMax", "pollStep") From bf642806611f2450c83c5ce27a499940ad88e20b Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 15 Jun 2016 13:45:07 +0800 Subject: [PATCH 314/320] FIX: Incorrect scope when checking for existing topic link. --- app/models/topic_link.rb | 2 +- spec/models/topic_link_spec.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index 27735689d85..2f7cc745236 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -161,7 +161,7 @@ class TopicLink < ActiveRecord::Base added_urls << url topic_link = TopicLink.find_by(topic_id: post.topic_id, - user_id: post.user_id, + post_id: post.id, url: url) unless topic_link diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb index 5aca2837b17..314276a26dd 100644 --- a/spec/models/topic_link_spec.rb +++ b/spec/models/topic_link_spec.rb @@ -121,6 +121,16 @@ http://b.com/#{'a'*500} expect(reflection.user_id).to eq(link.user_id) end + PostOwnerChanger.new( + post_ids: [linked_post.id], + topic_id: topic.id, + acting_user: user, + new_owner: Fabricate(:user) + ).change_owner! + + TopicLink.extract_from(linked_post) + expect(topic.topic_links.first.url).to eq(url) + linked_post.revise(post.user, { raw: "no more linkies https://eviltrout.com" }) expect(other_topic.topic_links.where(link_post_id: linked_post.id)).to be_blank end From ed4634dc341d76f2131b979dac0d97cc8090972e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 15 Jun 2016 14:41:08 +0200 Subject: [PATCH 315/320] FIX: don't error out when deleting a topic with no user --- app/services/staff_action_logger.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index 4793424b7bf..fdfc7f200b3 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -65,10 +65,12 @@ class StaffActionLogger def log_topic_deletion(deleted_topic, opts={}) raise Discourse::InvalidParameters.new(:deleted_topic) unless deleted_topic && deleted_topic.is_a?(Topic) + user = delete_topic.user ? "#{deleted_topic.user.username} (#{deleted_topic.user.name})" : "(deleted user)" + details = [ "id: #{deleted_topic.id}", "created_at: #{deleted_topic.created_at}", - "user: #{deleted_topic.user.username} (#{deleted_topic.user.name})", + "user: #{user}", "title: #{deleted_topic.title}" ] From 367954057baf0e042efb97dcbf470cbad96611ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 15 Jun 2016 14:45:18 +0200 Subject: [PATCH 316/320] should have been 'deleted_topic' --- app/services/staff_action_logger.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index fdfc7f200b3..8623602b3a4 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -65,7 +65,7 @@ class StaffActionLogger def log_topic_deletion(deleted_topic, opts={}) raise Discourse::InvalidParameters.new(:deleted_topic) unless deleted_topic && deleted_topic.is_a?(Topic) - user = delete_topic.user ? "#{deleted_topic.user.username} (#{deleted_topic.user.name})" : "(deleted user)" + user = deleted_topic.user ? "#{deleted_topic.user.username} (#{deleted_topic.user.name})" : "(deleted user)" details = [ "id: #{deleted_topic.id}", From 1c9519636c1b4ffffc37e07864994ce58ef6cd69 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 15 Jun 2016 10:51:26 -0400 Subject: [PATCH 317/320] FEATURE: new users can be blocked from posting if enough TL3 users flag their posts --- app/models/post_action.rb | 2 +- app/services/spam_rule/auto_block.rb | 44 ++++++++++++++-- spec/services/auto_block_spec.rb | 75 ++++++++++++++++++++++++++-- 3 files changed, 110 insertions(+), 11 deletions(-) diff --git a/app/models/post_action.rb b/app/models/post_action.rb index 3ac3d5d02a0..f149c29aee0 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -448,7 +448,7 @@ SQL post = Post.with_deleted.where(id: post_id).first PostAction.auto_close_if_threshold_reached(post.topic) PostAction.auto_hide_if_needed(user, post, post_action_type_key) - SpamRulesEnforcer.enforce!(post.user) if post_action_type_key == :spam + SpamRulesEnforcer.enforce!(post.user) end def notify_subscribers diff --git a/app/services/spam_rule/auto_block.rb b/app/services/spam_rule/auto_block.rb index 6c5d5018728..2a3f83e4504 100644 --- a/app/services/spam_rule/auto_block.rb +++ b/app/services/spam_rule/auto_block.rb @@ -17,13 +17,25 @@ class SpamRule::AutoBlock end def block? - @user.blocked? or - (!@user.staged? and - !@user.has_trust_level?(TrustLevel[1]) and - SiteSetting.num_flags_to_block_new_user > 0 and + return true if @user.blocked? + return false if @user.staged? + return false if @user.has_trust_level?(TrustLevel[1]) + + if SiteSetting.num_flags_to_block_new_user > 0 and SiteSetting.num_users_to_block_new_user > 0 and num_spam_flags_against_user >= SiteSetting.num_flags_to_block_new_user and - num_users_who_flagged_spam_against_user >= SiteSetting.num_users_to_block_new_user) + num_users_who_flagged_spam_against_user >= SiteSetting.num_users_to_block_new_user + return true + end + + if SiteSetting.num_tl3_flags_to_block_new_user > 0 and + SiteSetting.num_tl3_users_to_block_new_user > 0 and + num_tl3_flags_against_user >= SiteSetting.num_tl3_flags_to_block_new_user and + num_tl3_users_who_flagged >= SiteSetting.num_tl3_users_to_block_new_user + return true + end + + false end def num_spam_flags_against_user @@ -36,6 +48,28 @@ class SpamRule::AutoBlock PostAction.spam_flags.where(post_id: post_ids).uniq.pluck(:user_id).size end + def num_tl3_flags_against_user + if flagged_post_ids.empty? + 0 + else + PostAction.where(post_id: flagged_post_ids).joins(:user).where('users.trust_level >= ?', 3).count + end + end + + def num_tl3_users_who_flagged + if flagged_post_ids.empty? + 0 + else + PostAction.where(post_id: flagged_post_ids).joins(:user).where('users.trust_level >= ?', 3).pluck(:user_id).uniq.size + end + end + + def flagged_post_ids + Post.where(user_id: @user.id) + .where('spam_count > ? OR off_topic_count > ? OR inappropriate_count > ?', 0, 0, 0) + .pluck(:id) + end + def block_user Post.transaction do if UserBlocker.block(@user, Discourse.system_user, message: :too_many_spam_flags) && SiteSetting.notify_mods_when_user_blocked diff --git a/spec/services/auto_block_spec.rb b/spec/services/auto_block_spec.rb index d23738835a8..3ce4630462a 100644 --- a/spec/services/auto_block_spec.rb +++ b/spec/services/auto_block_spec.rb @@ -3,9 +3,9 @@ require 'rails_helper' describe SpamRule::AutoBlock do before do - SiteSetting.stubs(:flags_required_to_hide_post).returns(0) # never - SiteSetting.stubs(:num_flags_to_block_new_user).returns(2) - SiteSetting.stubs(:num_users_to_block_new_user).returns(2) + SiteSetting.flags_required_to_hide_post = 0 # never + SiteSetting.num_flags_to_block_new_user = 2 + SiteSetting.num_users_to_block_new_user = 2 end describe 'perform' do @@ -86,6 +86,44 @@ describe SpamRule::AutoBlock do end end + describe 'num_tl3_flags_against_user' do + let(:post) { Fabricate(:post) } + let(:enforcer) { described_class.new(post.user) } + + it "counts flags of all types from tl3 users only" do + Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:inappropriate]) + expect(enforcer.num_tl3_flags_against_user).to eq(0) + Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 3), post_action_type_id: PostActionType.types[:inappropriate]) + expect(enforcer.num_tl3_flags_against_user).to eq(1) + Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:spam]) + Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 3), post_action_type_id: PostActionType.types[:spam]) + expect(enforcer.num_tl3_flags_against_user).to eq(2) + end + end + + describe 'num_tl3_users_who_flagged' do + let(:post) { Fabricate(:post) } + let(:enforcer) { described_class.new(post.user) } + + it "counts only tl3 users who flagged with any type" do + Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:inappropriate]) + expect(enforcer.num_tl3_users_who_flagged).to eq(0) + + tl3_user1 = Fabricate(:user, trust_level: 3) + Fabricate(:flag, post: post, user: tl3_user1, post_action_type_id: PostActionType.types[:inappropriate]) + expect(enforcer.num_tl3_users_who_flagged).to eq(1) + + Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:spam]) + expect(enforcer.num_tl3_users_who_flagged).to eq(1) + + Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 3), post_action_type_id: PostActionType.types[:spam]) + expect(enforcer.num_tl3_users_who_flagged).to eq(2) + + Fabricate(:flag, post: Fabricate(:post, user: post.user), user: tl3_user1, post_action_type_id: PostActionType.types[:inappropriate]) + expect(enforcer.num_tl3_users_who_flagged).to eq(2) + end + end + describe 'block_user' do let!(:admin) { Fabricate(:admin) } # needed for SystemMessage let(:user) { Fabricate(:user) } @@ -109,7 +147,7 @@ describe SpamRule::AutoBlock do end it 'sends private message to moderators' do - SiteSetting.stubs(:notify_mods_when_user_blocked).returns(true) + SiteSetting.notify_mods_when_user_blocked = true moderator = Fabricate(:moderator) GroupMessage.expects(:create).with do |group, msg_type, params| group == Group[:moderators].name and msg_type == :user_automatically_blocked and params[:user].id == user.id @@ -144,6 +182,8 @@ describe SpamRule::AutoBlock do enforcer = described_class.new(user) enforcer.expects(:num_spam_flags_against_user).never enforcer.expects(:num_users_who_flagged_spam_against_user).never + enforcer.expects(:num_flags_against_user).never + enforcer.expects(:num_users_who_flagged).never expect(enforcer.block?).to eq(false) end end @@ -189,7 +229,7 @@ describe SpamRule::AutoBlock do end it 'returns false if num_flags_to_block_new_user is 0' do - SiteSetting.stubs(:num_flags_to_block_new_user).returns(0) + SiteSetting.num_flags_to_block_new_user = 0 subject.stubs(:num_spam_flags_against_user).returns(100) subject.stubs(:num_users_who_flagged_spam_against_user).returns(100) expect(subject.block?).to be_falsey @@ -207,6 +247,31 @@ describe SpamRule::AutoBlock do subject.stubs(:num_users_who_flagged_spam_against_user).returns(2) expect(subject.block?).to be_truthy end + + context "all types of flags" do + before do + SiteSetting.num_tl3_flags_to_block_new_user = 3 + SiteSetting.num_tl3_users_to_block_new_user = 2 + end + + it 'returns false if there are not enough flags' do + subject.stubs(:num_tl3_flags_against_user).returns(1) + subject.stubs(:num_tl3_users_who_flagged).returns(1) + expect(subject.block?).to be_falsey + end + + it 'returns false if enough flags but not enough users' do + subject.stubs(:num_tl3_flags_against_user).returns(3) + subject.stubs(:num_tl3_users_who_flagged).returns(1) + expect(subject.block?).to be_falsey + end + + it 'returns true if enough flags and users' do + subject.stubs(:num_tl3_flags_against_user).returns(3) + subject.stubs(:num_tl3_users_who_flagged).returns(2) + expect(subject.block?).to eq(true) + end + end end context "blocked, but has higher trust level now" do From fd91a8eee60c4854c6af59a94020e931aa0cbe50 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 15 Jun 2016 21:21:17 +0800 Subject: [PATCH 318/320] Bunch of UX changes for polls builder. --- .../discourse/templates/modals/poll-ui-builder.hbs | 10 +++++----- .../assets/stylesheets/common/poll-ui-builder.scss | 7 +++++++ plugins/poll/config/locales/client.en.yml | 11 +++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs index c800db9aff9..bdb14b28528 100644 --- a/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs +++ b/plugins/poll/assets/javascripts/discourse/templates/modals/poll-ui-builder.hbs @@ -1,12 +1,12 @@
    - + {{input name="poll-name" value=pollName placeholder=pollNamePlaceholder}}
    - + {{combo-box content=pollTypes value=pollType valueAttribute="value" @@ -36,7 +36,7 @@
    -
    - {{d-button action="insertPoll" class='btn-primary' label='poll.ui_builder.insert' disabled=disableInsert}} + {{d-button action="insertPoll" icon="bar-chart-o" class='btn-primary' label='poll.ui_builder.insert' disabled=disableInsert}}
    diff --git a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss index a8467a3abbd..184cd20573d 100644 --- a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss +++ b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss @@ -1,4 +1,6 @@ .poll-ui-builder-form { + margin: 0px; + .input-group { padding: 10px; } @@ -8,6 +10,11 @@ display: inline; } + .input-group-label { + display: inline-block; + width: 45px; + } + .combobox { margin-right: 5px; } diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml index 7113b022d74..fe219800968 100644 --- a/plugins/poll/config/locales/client.en.yml +++ b/plugins/poll/config/locales/client.en.yml @@ -72,14 +72,13 @@ en: ui_builder: title: Poll Builder insert: Insert Poll - reset: Reset Poll help: options_count: You must provide a minimum of 2 options. poll_name: - label: Poll Name - placeholder: Enter Poll Name + label: Name + placeholder: Enter Name poll_type: - label: Poll Type + label: Type regular: regular multiple: multiple number: number @@ -88,6 +87,6 @@ en: min: Min step: Step poll_public: - label: Make Public Poll + label: Show who voted poll_options: - label: "Poll Choices: (one option per line)" + label: Enter one poll option per line From 169d17edc36a263ad75b8147ac1250e15fe7241b Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 15 Jun 2016 18:40:13 +0800 Subject: [PATCH 319/320] Include cdn path in the stylesheet digest. --- lib/sass/discourse_stylesheets.rb | 12 ++++++++---- spec/components/discourse_stylesheets_spec.rb | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lib/sass/discourse_stylesheets.rb b/lib/sass/discourse_stylesheets.rb index ac4955dbd51..5bcd76fce41 100644 --- a/lib/sass/discourse_stylesheets.rb +++ b/lib/sass/discourse_stylesheets.rb @@ -59,7 +59,7 @@ class DiscourseStylesheets def self.max_file_mtime globs = ["#{Rails.root}/app/assets/stylesheets/**/*.*css"] - for path in (Discourse.plugins || []).map { |plugin| File.dirname(plugin.path) } + Discourse.plugins.map { |plugin| File.dirname(plugin.path) }.each do |path| globs += [ "#{path}/plugin.rb", "#{path}/**/*.*css", @@ -71,8 +71,6 @@ class DiscourseStylesheets end.compact.max.to_i end - - def initialize(target = :desktop) @target = target end @@ -167,7 +165,13 @@ class DiscourseStylesheets if theme || category_updated > 0 Digest::SHA1.hexdigest "#{RailsMultisite::ConnectionManagement.current_db}-#{theme}-#{DiscourseStylesheets.last_file_updated}-#{category_updated}" else - Digest::SHA1.hexdigest "defaults-#{DiscourseStylesheets.last_file_updated}" + digest_string = "defaults-#{DiscourseStylesheets.last_file_updated}" + + if cdn_url = GlobalSetting.cdn_url + digest_string = "#{digest_string}-#{cdn_url}" + end + + Digest::SHA1.hexdigest digest_string end end end diff --git a/spec/components/discourse_stylesheets_spec.rb b/spec/components/discourse_stylesheets_spec.rb index ec3cead6e99..30562a58449 100644 --- a/spec/components/discourse_stylesheets_spec.rb +++ b/spec/components/discourse_stylesheets_spec.rb @@ -29,4 +29,18 @@ describe DiscourseStylesheets do end end + describe "#digest" do + before do + described_class.expects(:max_file_mtime).returns(Time.new(2016, 06, 05, 12, 30, 0, 0)) + end + + it "should return a digest" do + expect(described_class.new.digest).to eq('0e6c2e957cfc92ed60661c90ec3345198ccef887') + end + + it "should include the cdn url when generating the digest" do + GlobalSetting.expects(:cdn_url).returns('https://fastly.maxcdn.org') + expect(described_class.new.digest).to eq('4995163b1232c54c8ed3b44200d803a90bc47613') + end + end end From d62f2b4d6742f02a2f602dfb855c8fe91662ac74 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 15 Jun 2016 13:18:54 -0400 Subject: [PATCH 320/320] UX: rename setting num_flags_to_block_new_user to num_spam_flags_to_block_new_user --- app/services/spam_rule/auto_block.rb | 4 ++-- config/locales/server.en.yml | 4 ++-- config/site_settings.yml | 2 +- spec/integration/spam_rules_spec.rb | 2 +- spec/services/auto_block_spec.rb | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/services/spam_rule/auto_block.rb b/app/services/spam_rule/auto_block.rb index 2a3f83e4504..a44ac9a115a 100644 --- a/app/services/spam_rule/auto_block.rb +++ b/app/services/spam_rule/auto_block.rb @@ -21,9 +21,9 @@ class SpamRule::AutoBlock return false if @user.staged? return false if @user.has_trust_level?(TrustLevel[1]) - if SiteSetting.num_flags_to_block_new_user > 0 and + if SiteSetting.num_spam_flags_to_block_new_user > 0 and SiteSetting.num_users_to_block_new_user > 0 and - num_spam_flags_against_user >= SiteSetting.num_flags_to_block_new_user and + num_spam_flags_against_user >= SiteSetting.num_spam_flags_to_block_new_user and num_users_who_flagged_spam_against_user >= SiteSetting.num_users_to_block_new_user return true end diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 7f2a04b795c..b695310072c 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -885,8 +885,8 @@ en: tl3_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl3 (regular) by multiplying with this number" tl4_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl4 (leader) by multiplying with this number" - num_flags_to_block_new_user: "If a new user's posts get this many spam flags from num_users_to_block_new_user different users, hide all their posts and prevent future posting. 0 to disable." - num_users_to_block_new_user: "If a new user's posts get num_flags_to_block_new_user spam flags from this many different users, hide all their posts and prevent future posting. 0 to disable." + num_spam_flags_to_block_new_user: "If a new user's posts get this many spam flags from num_users_to_block_new_user different users, hide all their posts and prevent future posting. 0 to disable." + num_users_to_block_new_user: "If a new user's posts get num_spam_flags_to_block_new_user spam flags from this many different users, hide all their posts and prevent future posting. 0 to disable." num_tl3_flags_to_block_new_user: "If a new user's posts get this many flags from num_tl3_users_to_block_new_user different trust level 3 users, hide all their posts and prevent future posting. 0 to disable." num_tl3_users_to_block_new_user: "If a new user's posts get num_tl3_flags_to_block_new_user flags from this many different trust level 3 users, hide all their posts and prevent future posting. 0 to disable." notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators." diff --git a/config/site_settings.yml b/config/site_settings.yml index a1dad349973..d3b255bcf30 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -776,7 +776,7 @@ spam: add_rel_nofollow_to_user_content: true flags_required_to_hide_post: 3 cooldown_minutes_after_hiding_posts: 10 - num_flags_to_block_new_user: 3 + num_spam_flags_to_block_new_user: 3 num_users_to_block_new_user: 3 num_tl3_flags_to_block_new_user: 6 num_tl3_users_to_block_new_user: 4 diff --git a/spec/integration/spam_rules_spec.rb b/spec/integration/spam_rules_spec.rb index 04f8b41ee06..1a637d8b7b9 100644 --- a/spec/integration/spam_rules_spec.rb +++ b/spec/integration/spam_rules_spec.rb @@ -7,7 +7,7 @@ describe SpamRulesEnforcer do describe 'auto-blocking users based on flagging' do before do SiteSetting.stubs(:flags_required_to_hide_post).returns(0) # never - SiteSetting.stubs(:num_flags_to_block_new_user).returns(2) + SiteSetting.stubs(:num_spam_flags_to_block_new_user).returns(2) SiteSetting.stubs(:num_users_to_block_new_user).returns(2) end diff --git a/spec/services/auto_block_spec.rb b/spec/services/auto_block_spec.rb index 3ce4630462a..b2216973de5 100644 --- a/spec/services/auto_block_spec.rb +++ b/spec/services/auto_block_spec.rb @@ -4,7 +4,7 @@ describe SpamRule::AutoBlock do before do SiteSetting.flags_required_to_hide_post = 0 # never - SiteSetting.num_flags_to_block_new_user = 2 + SiteSetting.num_spam_flags_to_block_new_user = 2 SiteSetting.num_users_to_block_new_user = 2 end @@ -228,8 +228,8 @@ describe SpamRule::AutoBlock do expect(subject.block?).to be_falsey end - it 'returns false if num_flags_to_block_new_user is 0' do - SiteSetting.num_flags_to_block_new_user = 0 + it 'returns false if num_spam_flags_to_block_new_user is 0' do + SiteSetting.num_spam_flags_to_block_new_user = 0 subject.stubs(:num_spam_flags_against_user).returns(100) subject.stubs(:num_users_who_flagged_spam_against_user).returns(100) expect(subject.block?).to be_falsey
- {{#each users as |user|}} + {{#each pollsVoters as |user|}}
  • {{avatar user imageSize="tiny" ignoreTitle="true"}} @@ -8,12 +8,10 @@ {{/each}}
    - {{#if showMore}} - {{#if isExpanded}} - {{fa-icon "chevron-up"}} - {{else}} - {{fa-icon "chevron-down"}} - {{/if}} + {{#if canLoadMore}} + {{#conditional-loading-spinner condition=loading size="small"}} + {{fa-icon "chevron-down"}} + {{/conditional-loading-spinner}} {{/if}}