Merge branch 'master' into dependabot/bundler/stripe-5.42.0

Author: drusepth

Gemfile

@@ -78,6 +78,7 @@ gem 'thredded', git: 'https://github.com/indentlabs/thredded.git', branch: 'feat
 # gem 'thredded', git: 'https://github.com/sudara/thredded', branch: 'master'
 gem 'rails-ujs'
 gem 'language_filter'
+gem 'discordrb'
 
 # Smarts
 gem 'word_count_analyzer'

Gemfile.lock

@@ -117,7 +117,7 @@ GEM
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.503.0)
+    aws-partitions (1.543.0)
     aws-sdk (3.1.0)
       aws-sdk-resources (~> 3)
     aws-sdk-accessanalyzer (1.23.0)
@@ -315,9 +315,9 @@ GEM
     aws-sdk-connectparticipant (1.14.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.121.0)
+    aws-sdk-core (3.125.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
     aws-sdk-costandusagereportservice (1.34.0)
@@ -578,8 +578,8 @@ GEM
     aws-sdk-kinesisvideosignalingchannels (1.13.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.48.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-kms (1.53.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-lakeformation (1.17.0)
       aws-sdk-core (~> 3, >= 3.120.0)
@@ -1086,8 +1086,8 @@ GEM
     aws-sdk-route53resolver (1.30.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.103.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.110.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sdk-s3control (1.40.0)
@@ -1281,7 +1281,7 @@ GEM
     concurrent-ruby (1.1.9)
     connection_pool (2.2.5)
     crass (1.0.6)
-    csv (3.2.0)
+    csv (3.2.2)
     d3-rails (5.9.2)
       railties (>= 3.1)
     database_cleaner (2.0.1)
@@ -1301,11 +1301,20 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
+    discordrb (3.4.0)
+      discordrb-webhooks (~> 3.3.0)
+      ffi (>= 1.9.24)
+      opus-ruby
+      rest-client (>= 2.0.0)
+      websocket-client-simple (>= 0.3.0)
+    discordrb-webhooks (3.3.0)
+      rest-client (>= 2.1.0.rc1)
     docile (1.1.5)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     engtagger (0.2.1)
     erubi (1.10.0)
+    event_emitter (0.2.6)
     eventmachine (1.2.7)
     execjs (2.8.1)
     faraday (0.17.4)
@@ -1339,6 +1348,7 @@ GEM
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
       http-parser (~> 1.2.0)
+    http-accept (1.7.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
@@ -1423,6 +1433,7 @@ GEM
     multipart-post (2.1.1)
     mustache (1.1.1)
     nested_form (0.3.2)
+    netrc (0.11.0)
     newrelic_rpm (8.0.0)
     nio4r (2.5.8)
     nokogiri (1.12.5)
@@ -1435,6 +1446,8 @@ GEM
       mustache
       nokogiri (~> 1.7)
       sanitize
+    opus-ruby (1.0.1)
+      ffi
     orm_adapter (0.5.0)
     paperclip (6.1.0)
       activemodel (>= 4.2.0)
@@ -1533,9 +1546,14 @@ GEM
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rexml (3.2.5)
     rinku (2.0.6)
-    rmagick (4.2.2)
+    rmagick (4.2.4)
     ruby-vips (2.0.17)
       ffi (~> 1.9)
     rubyzip (2.0.0)
@@ -1614,6 +1632,10 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
+    websocket (1.2.9)
+    websocket-client-simple (0.3.0)
+      event_emitter
+      websocket
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -1644,6 +1666,7 @@ DEPENDENCIES
   database_cleaner
   dateslices
   devise
+  discordrb
   engtagger
   filesize
   flamegraph

app/controllers/admin_controller.rb

@@ -59,6 +59,13 @@ def reported_shares
   def churn
   end
 
+  def notifications
+    @clicked_notifications = Notification.where.not(viewed_at: nil)
+    @notifications = Notification.all.order(:reference_code)
+
+    @codes = Notification.distinct.order('reference_code').pluck(:reference_code)
+  end
+
   def hate
     @posts = Thredded::PrivatePost.order('id DESC').limit(params.fetch(:limit, 500)).includes(:postable)
     @list  = params[:matchlist]

app/controllers/contributors_controller.rb

@@ -13,7 +13,8 @@ def destroy
         icon:             Universe.icon,
         icon_color:       Universe.color,
         happened_at:      DateTime.current,
-        passthrough_link: Rails.application.routes.url_helpers.universe_path(relevant_universe)
+        passthrough_link: Rails.application.routes.url_helpers.universe_path(relevant_universe),
+        reference_code:   'contributor-removed'
       ) if user.present?
 
       # Create a notification letting the universe owner know
@@ -22,7 +23,8 @@ def destroy
         icon:             Universe.icon,
         icon_color:       Universe.color,
         happened_at:      DateTime.current,
-        passthrough_link: Rails.application.routes.url_helpers.universe_path(relevant_universe)
+        passthrough_link: Rails.application.routes.url_helpers.universe_path(relevant_universe),
+        reference_code:   'contributor-left'
       ) if user.present?
 
       #todo send "you've been removed as a contributor" email

app/controllers/data_controller.rb

@@ -18,12 +18,18 @@ def review_year
 
     @created_content = {}
     @total_created_non_universe_content = 0
+    @words_written = 0
     Rails.application.config.content_types[:all].each do |klass|
       @created_content[klass.name] = klass.where(user_id: current_user.id)
                                           .where('created_at > ?', comparable_year.beginning_of_year)
                                           .where('created_at < ?', comparable_year.end_of_year)
                                           .order('created_at ASC')
 
+      @words_written += WordCountUpdate.where(
+        entity_type: klass.name, 
+        entity_id: @created_content[klass.name].map(&:id)
+      ).sum(:word_count)
+
       if klass.name != 'Universe'
         @total_created_non_universe_content += @created_content[klass.name].count
       end
@@ -34,6 +40,8 @@ def review_year
                                                .where('created_at < ?', comparable_year.end_of_year)
                                                .order('created_at ASC')
 
+    @words_written += @created_content['Document'].sum(:cached_word_count)
+
     earliest_page_date = DateTime.current
     @earliest_page = nil
     @created_content.each do |content_type, list|
@@ -80,7 +88,6 @@ def review_year
 
     @published_collections = PageCollection.where(id: @created_content['PageCollectionSubmission'].pluck(:page_collection_id) - @created_content['PageCollection'].pluck(:id))
     @publish_rate = @created_content['PageCollectionSubmission'].select { |s| s.accepted_at.present? && !@created_content['PageCollection'].pluck(:id).include?(s.page_collection_id) }.count.to_f / @created_content['PageCollectionSubmission'].count
-
   end
 
   def archive

app/controllers/page_collection_submissions_controller.rb

@@ -68,7 +68,8 @@ def approve
       icon:             PageCollection.icon,
       icon_color:       PageCollection.color,
       happened_at:      DateTime.current,
-      passthrough_link: Rails.application.routes.url_helpers.page_collection_path(@page_collection_submission.page_collection)
+      passthrough_link: Rails.application.routes.url_helpers.page_collection_path(@page_collection_submission.page_collection),
+      reference_code:   'approved-in-collection'
     )
 
     redirect_to(page_collection_pending_submissions_path(@page_collection_submission.page_collection), notice: "Submission approved!")

app/controllers/registrations_controller.rb

@@ -88,7 +88,8 @@ def add_account
             icon:             Universe.icon,
             icon_color:       Universe.color,
             happened_at:      DateTime.current,
-            passthrough_link: Rails.application.routes.url_helpers.universe_path(contributorship.universe)
+            passthrough_link: Rails.application.routes.url_helpers.universe_path(contributorship.universe),
+            reference_code:   'contributor-added'
           )
         end
       end

app/controllers/subscriptions_controller.rb

@@ -224,7 +224,8 @@ def redeem_code
       icon:             'star',
       icon_color:       'text-darken-3 yellow',
       happened_at:      DateTime.current,
-      passthrough_link: Rails.application.routes.url_helpers.customization_content_types_path
+      passthrough_link: Rails.application.routes.url_helpers.customization_content_types_path,
+      reference_code:   'premium-activation'
     )
 
     redirect_back(fallback_location: subscription_path, notice: "Promo code successfully activated!")

app/controllers/user_followings_controller.rb

@@ -34,7 +34,8 @@ def create
         icon:             User.icon,
         icon_color:       User.color,
         happened_at:      DateTime.current,
-        passthrough_link: Rails.application.routes.url_helpers.user_path(@user_following.user)
+        passthrough_link: Rails.application.routes.url_helpers.user_path(@user_following.user),
+        reference_code:   'followed-by-user'
       )
 
       redirect_to @user_following.followed_user, notice: "You're now following #{@user_following.followed_user.name.presence || 'this user'}"

app/jobs/content_page_share_notification_job.rb

@@ -20,7 +20,8 @@ def perform(*args)
         passthrough_link: Rails.application.routes.url_helpers.user_content_page_share_path(
           id:      comment.content_page_share.id,
           user_id: comment.content_page_share.user_id
-        )
+        ),
+        reference_code: 'comment-on-shared-page'
       )
     end
   end