+ <%= number_with_delimiter @clicked_notifications.count %> clicked
+ /
+ <%= number_with_delimiter @notifications.count %> total
+ (<%= @clicked_notifications.count / @notifications.count.to_f * 100 %>%)
+
+
+<% @codes.each do |code| %>
+
We're extremely excited to be a part of a super cool project put together by our friends at Infostack.io: a gigantic bundle of high-quality writing tools
for a low, super-accessible price. If you've already purchased the stack for yourself (or a friend—they make great gifts!),
@@ -15,57 +15,12 @@
- <%= link_to 'Buy the stack ($50)', 'https://drusepth--infostack.thrivecart.com/wc', class: 'hoverable btn btn-large white-text blue' %>
+ <%= link_to 'Buy the stack ($49)', 'https://drusepth--infostack.thrivecart.com/wc3 ', class: 'hoverable btn btn-large white-text blue' %>
- Now that you're signed into a Notebook.ai account, you can paste the code you received from the Writer's Craft Super Stack into the box below.
+ Now that you're signed into a Notebook.ai account, you can paste the code you received from the Writer's Craft 3.0 into the box below.
Your account will be immediately upgraded to Premium (normally $9/month) for 6 months.
@@ -120,7 +75,7 @@
<% else %>
- Once you've signed into a Notebook.ai account, you can paste the code you received from the Writer's Craft Super Stack into the box below.
+ Once you've signed into a Notebook.ai account, you can paste the code you received from the Writer's Craft 3.0 into the box below.
Your account will be immediately upgraded to Premium (normally $9/month) for 6 months.
diff --git a/app/views/timelines/index.html.erb b/app/views/timelines/index.html.erb
index 8a685a4aa..8389bbd9f 100644
--- a/app/views/timelines/index.html.erb
+++ b/app/views/timelines/index.html.erb
@@ -59,13 +59,17 @@
- <%= link_to timeline_path(timeline), class: 'blue-text left' do %>
-
<%= Timeline.icon %>
- View
+ <% if timeline.readable_by?(current_user) %>
+ <%= link_to timeline_path(timeline), class: 'blue-text left' do %>
+
<%= Timeline.icon %>
+ View
+ <% end %>
<% end %>
- <%= link_to edit_timeline_path(timeline), class: 'green-text right' do %>
-
edit
- Edit
+ <% if timeline.updatable_by?(current_user) %>
+ <%= link_to edit_timeline_path(timeline), class: 'green-text right' do %>
+
edit
+ Edit
+ <% end %>
<% end %>
diff --git a/config/attributes/school.yml b/config/attributes/school.yml
index 71476cdbd..da8f83b32 100644
--- a/config/attributes/school.yml
+++ b/config/attributes/school.yml
@@ -89,6 +89,8 @@
:label: Past students
- :name: famous_students
:label: Famous students
+ - :name: headcount
+ :label: Headcount
:extracurriculars:
:label: Extracurriculars
:icon: rowing
diff --git a/config/routes.rb b/config/routes.rb
index 96b6af37e..e2ddef15e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -98,6 +98,11 @@
get '/scratchpad', to: 'main#notes', as: :notes
+ get 'tag/remove', to: 'page_tags#remove'
+ # post 'tag/:slug/update', to: 'page_tags#update', as: :update_tag
+ post '/tag/:tag/rename', to: 'page_tags#rename', as: :rename_tag
+ delete 'tag/:id/destroy', to: 'page_tags#destroy', as: :destroy_specific_tag
+
# Legacy route: left intact so /my/documents/X URLs continue to work for everyone's bookmarks
resources :documents
@@ -133,6 +138,7 @@
scope '/data' do
get '/', to: 'data#index', as: :data_vault
get '/usage', to: 'data#usage'
+ get '/tags', to: 'data#tags'
get '/recyclebin', to: 'data#recyclebin'
get '/archive', to: 'data#archive'
get '/documents', to: 'data#documents', as: :data_documents
@@ -274,6 +280,7 @@
get '/churn', to: 'admin#churn'
get '/hatewatch/:matchlist', to: 'admin#hate'
get '/spamwatch', to: 'admin#spam'
+ get '/notifications', to: 'admin#notifications'
post '/perform_unsubscribe', to: 'admin#perform_unsubscribe', as: :perform_unsubscribe
end
mount RailsAdmin::Engine => '/admin', as: 'rails_admin'
diff --git a/db/migrate/20210729092029_add_service_name_to_active_storage_blobs.active_storage.rb b/db/migrate/20210729092029_add_service_name_to_active_storage_blobs.active_storage.rb
new file mode 100644
index 000000000..9967a1323
--- /dev/null
+++ b/db/migrate/20210729092029_add_service_name_to_active_storage_blobs.active_storage.rb
@@ -0,0 +1,18 @@
+# This migration comes from active_storage (originally 20190112182829)
+class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
+ def up
+ unless column_exists?(:active_storage_blobs, :service_name)
+ add_column :active_storage_blobs, :service_name, :string
+
+ if configured_service = ActiveStorage::Blob.service.name
+ ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
+ end
+
+ change_column :active_storage_blobs, :service_name, :string, null: false
+ end
+ end
+
+ def down
+ remove_column :active_storage_blobs, :service_name
+ end
+end
diff --git a/db/migrate/20210729092030_create_active_storage_variant_records.active_storage.rb b/db/migrate/20210729092030_create_active_storage_variant_records.active_storage.rb
new file mode 100644
index 000000000..a2862695e
--- /dev/null
+++ b/db/migrate/20210729092030_create_active_storage_variant_records.active_storage.rb
@@ -0,0 +1,12 @@
+# This migration comes from active_storage (originally 20191206030411)
+class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
+ def change
+ create_table :active_storage_variant_records do |t|
+ t.belongs_to :blob, null: false, index: false
+ t.string :variation_digest, null: false
+
+ t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
+ t.foreign_key :active_storage_blobs, column: :blob_id
+ end
+ end
+end
diff --git a/db/migrate/20211007215520_add_word_count_cache_to_attributes.rb b/db/migrate/20211007215520_add_word_count_cache_to_attributes.rb
new file mode 100644
index 000000000..f72faabd1
--- /dev/null
+++ b/db/migrate/20211007215520_add_word_count_cache_to_attributes.rb
@@ -0,0 +1,5 @@
+class AddWordCountCacheToAttributes < ActiveRecord::Migration[6.0]
+ def change
+ add_column :attributes, :word_count_cache, :integer
+ end
+end
diff --git a/db/migrate/20211007234707_create_word_count_updates.rb b/db/migrate/20211007234707_create_word_count_updates.rb
new file mode 100644
index 000000000..2d1b84ee3
--- /dev/null
+++ b/db/migrate/20211007234707_create_word_count_updates.rb
@@ -0,0 +1,12 @@
+class CreateWordCountUpdates < ActiveRecord::Migration[6.0]
+ def change
+ create_table :word_count_updates do |t|
+ t.references :user, null: false, foreign_key: true
+ t.references :entity, polymorphic: true, null: false
+ t.integer :word_count
+ t.date :for_date
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20211027065954_add_service_name_migration_again.rb b/db/migrate/20211027065954_add_service_name_migration_again.rb
new file mode 100644
index 000000000..e352ceb9c
--- /dev/null
+++ b/db/migrate/20211027065954_add_service_name_migration_again.rb
@@ -0,0 +1,17 @@
+class AddServiceNameMigrationAgain < ActiveRecord::Migration[6.1]
+ def up
+ unless column_exists?(:active_storage_blobs, :service_name)
+ add_column :active_storage_blobs, :service_name, :string
+
+ if configured_service = ActiveStorage::Blob.service.name
+ ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
+ end
+
+ change_column :active_storage_blobs, :service_name, :string, null: false
+ end
+ end
+
+ def down
+ remove_column :active_storage_blobs, :service_name
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 91d7d384a..187d87ad5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2,15 +2,15 @@
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
#
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
# be faster and is potentially less error prone than running all of your
# migrations from scratch. Old migrations may fail to apply correctly if those
# migrations use external dependencies or application code.
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2021_09_15_030031) do
+ActiveRecord::Schema.define(version: 2021_10_27_065954) do
create_table "active_storage_attachments", force: :cascade do |t|
t.string "name", null: false
@@ -27,12 +27,19 @@
t.string "filename", null: false
t.string "content_type"
t.text "metadata"
- t.bigint "byte_size", null: false
+ t.integer "byte_size", null: false
t.string "checksum", null: false
t.datetime "created_at", null: false
+ t.string "service_name", null: false
t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
end
+ create_table "active_storage_variant_records", force: :cascade do |t|
+ t.bigint "blob_id", null: false
+ t.string "variation_digest", null: false
+ t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
+ end
+
create_table "api_keys", force: :cascade do |t|
t.integer "user_id"
t.string "key"
@@ -165,6 +172,7 @@
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "deleted_at"
+ t.integer "word_count_cache"
t.index ["attribute_field_id", "deleted_at", "entity_id", "entity_type"], name: "attributes_afi_deleted_at_entity_id_entity_type"
t.index ["attribute_field_id", "deleted_at"], name: "index_attributes_on_attribute_field_id_and_deleted_at"
t.index ["attribute_field_id", "user_id", "entity_type", "entity_id", "deleted_at"], name: "attributes_afi_ui_et_ei_da"
@@ -3636,7 +3644,20 @@
t.integer "habitat_id"
end
+ create_table "word_count_updates", force: :cascade do |t|
+ t.integer "user_id", null: false
+ t.string "entity_type", null: false
+ t.integer "entity_id", null: false
+ t.integer "word_count"
+ t.date "for_date"
+ t.datetime "created_at", precision: 6, null: false
+ t.datetime "updated_at", precision: 6, null: false
+ t.index ["entity_type", "entity_id"], name: "index_word_count_updates_on_entity_type_and_entity_id"
+ t.index ["user_id"], name: "index_word_count_updates_on_user_id"
+ end
+
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
+ add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
add_foreign_key "api_keys", "users"
add_foreign_key "api_requests", "application_integrations"
add_foreign_key "api_requests", "integration_authorizations"
@@ -4047,4 +4068,5 @@
add_foreign_key "vehicles", "users"
add_foreign_key "votes", "users"
add_foreign_key "votes", "votables"
+ add_foreign_key "word_count_updates", "users"
end
diff --git a/docs/notification_example.rb b/docs/notification_example.rb
index db3d361d1..c32a4405d 100644
--- a/docs/notification_example.rb
+++ b/docs/notification_example.rb
@@ -2,11 +2,11 @@
User.find_each do |user|
user.notifications.create(
- message_html: "
New in Notebook.ai:
Document tags, folders, and more!",
- icon: Document.icon,
- icon_color: Document.color,
+ message_html: "
2021 is winding to a close...
Click here to see your year in review!",
+ icon: 'event_available',
+ icon_color: 'blue',
happened_at: DateTime.current,
- passthrough_link: "https://medium.com/indent-labs/write-and-organize-your-stories-in-notebook-ai-1d7821af6f07",
- reference_code: "documents-folders-and-tags"
+ passthrough_link: "https://www.notebook.ai/my/data/yearly/2021",
+ reference_code: "2021-year-in-review"
)
end
diff --git a/lib/extensions/thredded/topic.rb b/lib/extensions/thredded/topic.rb
index 95696f985..553301cd9 100644
--- a/lib/extensions/thredded/topic.rb
+++ b/lib/extensions/thredded/topic.rb
@@ -8,6 +8,7 @@ module Topic
included do
after_create :create_content_page_share
+ after_create :notify_discord
has_many :content_page_shares, as: :content
acts_as_paranoid
@@ -25,6 +26,10 @@ def self.text_color
end
end
+ def notify_discord
+ NotifyDiscordOfThreadJob.set(wait: 1.minute).perform_later(self.id)
+ end
+
def create_content_page_share
ContentPageShare.create(
user_id: self.user_id,
diff --git a/lib/tasks/backfill.rake b/lib/tasks/backfill.rake
index 713ded001..d8db6a3eb 100644
--- a/lib/tasks/backfill.rake
+++ b/lib/tasks/backfill.rake
@@ -1,4 +1,58 @@
namespace :backfill do
+ desc "Backfill cached word counts on all attributes"
+ task attribute_word_count_caches: :environment do
+ Attribute.where(word_count_cache: nil).where.not(value: ["", " ", ".", nil]).find_each do |attribute|
+ word_count = WordCountAnalyzer::Counter.new(
+ ellipsis: 'no_special_treatment',
+ hyperlink: 'count_as_one',
+ contraction: 'count_as_one',
+ hyphenated_word: 'count_as_one',
+ date: 'no_special_treatment',
+ number: 'count',
+ numbered_list: 'ignore',
+ xhtml: 'remove',
+ forward_slash: 'count_as_multiple_except_dates',
+ backslash: 'count_as_one',
+ dotted_line: 'ignore',
+ dashed_line: 'ignore',
+ underscore: 'ignore',
+ stray_punctuation: 'ignore'
+ ).count(attribute.value)
+
+ attribute.update_column(:word_count_cache, word_count)
+ end
+ end
+
+ task most_used_attribute_word_counts: :environment do
+ word_counts = {}
+ Attribute.where(word_count_cache: nil).group(:value).order('count_id DESC').limit(500).count(:id).each do |value, count|
+ word_count = WordCountAnalyzer::Counter.new(
+ ellipsis: 'no_special_treatment',
+ hyperlink: 'count_as_one',
+ contraction: 'count_as_one',
+ hyphenated_word: 'count_as_one',
+ date: 'no_special_treatment',
+ number: 'count',
+ numbered_list: 'ignore',
+ xhtml: 'remove',
+ forward_slash: 'count_as_multiple_except_dates',
+ backslash: 'count_as_one',
+ dotted_line: 'ignore',
+ dashed_line: 'ignore',
+ underscore: 'ignore',
+ stray_punctuation: 'ignore'
+ ).count(value)
+
+ word_counts[word_count] ||= []
+ word_counts[word_count].push value
+ puts "#{value} x #{count}: #{word_count} words"
+ end
+
+ word_counts.each do |count, values|
+ Attribute.where(word_count_cache: nil, value: values).update_all(word_count_cache: count)
+ end
+ end
+
desc "Backfill cached word counts on all documents"
task document_word_count_caches: :environment do
Document.where(cached_word_count: nil).where.not(body: [nil, ""]).find_each(batch_size: 500) do |document|
diff --git a/lib/tasks/one_off.rake b/lib/tasks/one_off.rake
index 26d539213..e327ae415 100644
--- a/lib/tasks/one_off.rake
+++ b/lib/tasks/one_off.rake
@@ -1,4 +1,15 @@
namespace :one_off do
+ desc "Clean up orphaned page tags"
+ task clean_orphaned_page_tags: :environment do
+ PageTag.find_each do |page_tag|
+ referenced_page = page_tag.page
+
+ if referenced_page.nil?
+ page_tag.destroy
+ end
+ end
+ end
+
desc "Alert users who've saved at least one tree"
task trees_notification: :environment do
reference_code = 'green-trees'
diff --git a/test/controllers/page_tags_controller_test.rb b/test/controllers/page_tags_controller_test.rb
new file mode 100644
index 000000000..2f89a08aa
--- /dev/null
+++ b/test/controllers/page_tags_controller_test.rb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class PageTagsControllerTest < ActionDispatch::IntegrationTest
+ test "should get remove" do
+ get page_tags_remove_url
+ assert_response :success
+ end
+
+end
diff --git a/test/fixtures/word_count_updates.yml b/test/fixtures/word_count_updates.yml
new file mode 100644
index 000000000..172493ff6
--- /dev/null
+++ b/test/fixtures/word_count_updates.yml
@@ -0,0 +1,15 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ user: one
+ entity: one
+ entity_type: Entity
+ word_count: 1
+ for_date: 2021-10-07
+
+two:
+ user: two
+ entity: two
+ entity_type: Entity
+ word_count: 1
+ for_date: 2021-10-07
diff --git a/test/models/word_count_update_test.rb b/test/models/word_count_update_test.rb
new file mode 100644
index 000000000..9f0e4d0bf
--- /dev/null
+++ b/test/models/word_count_update_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class WordCountUpdateTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end